lorax-embed-repo: Update to use HTTP-based location

rpm-ostree-toolbox always uses this code path now; we spawn an "ostree
trivial-httpd" even for local use.  That way the same template can be
used for both remote repositories and local ones.
This commit is contained in:
Colin Walters 2015-03-16 13:52:28 -04:00
parent 71c243e572
commit cba7d68879
1 changed files with 10 additions and 6 deletions

View File

@ -1,10 +1,14 @@
## Lorax template to embed ostree repo into installer
<%page args="root, ostree_osname, ostree_repo, ostree_ref"/>
## Lorax template to embed an OSTree repository into the installer.iso
## and configure an interactive installer use to look for it.
<%page args='root'/>
mkdir install/ostree
runcmd ostree --repo=${root}/install/ostree init --mode=archive-z2
runcmd ostree --repo=${root}/install/ostree pull-local --disable-fsync ${ostree_repo} ${ostree_ref}
runcmd ostree remote add ostree-mirror --repo=${root}/install/ostree/ --set=gpg-verify=false @OSTREE_URL@
runcmd ostree --repo=${root}/install/ostree/ pull --mirror ostree-mirror @OSTREE_REF@
append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=@OSTREE_OSNAME@ --remote=@OSTREE_OSNAME@ --url=file:///install/ostree --ref=@OSTREE_REF@\n"
append usr/share/anaconda/interactive-defaults.ks "services --disabled cloud-init,cloud-config,cloud-final,cloud-init-local\n"
append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/@OSTREE_OSNAME@.conf\n%end\n"
append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=${ostree_osname} --remote=${ostree_osname} --url=file:///install/ostree --ref=${ostree_ref}\n"