PR#14: workstation-ostree-installer: Switch to storing the OSTree repo in / - fedora-lorax-templates

fedora-lorax-templates

#14 workstation-ostree-installer: Switch to storing the OSTree repo in /

Merged 7 years ago by ausil. Opened 7 years ago by otaylor.

otaylor/fedora-lorax-templates file-conflicts-f26 into f26

workstation-ostree-installer: Switch to storing the OSTree repo in /

Owen W. Taylor • 7 years ago

fce047b

workstation-ostree-installer/lorax-configure-repo.tmpl

file modified

+1 -1

		`@@ -2,7 +2,7 @@`
		`## repository on disk.`

		`<%page args="ostree_osname, ostree_ref"/>`
		`- append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=${ostree_osname} --remote=${ostree_osname} --url=file:////run/install/repo/content/repo --ref=${ostree_ref}\n"`
		`+ append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=${ostree_osname} --remote=${ostree_osname} --url=file:///ostree/repo --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\nostree remote add --set=gpg-verify=false ${ostree_osname} 'https://kojipkgs.fedoraproject.org/compose/ostree/26/'\n%end\n"`

workstation-ostree-installer/lorax-embed-repo.tmpl

file modified

+5 -5

		`@@ -4,8 +4,8 @@`
		`## Note that we pull with depth=0 to only get one commit into the`
		`## ISO, because we obviously don't want the full history.`

		`- <%page args="workdir, ostree_osname, ostree_repo, ostree_ref"/>`
		`- runcmd mkdir -p ${workdir}/iso-graft/content/repo`
		`- runcmd ostree --repo=${workdir}/iso-graft/content/repo init --mode=archive-z2`
		`- runcmd ostree --repo=${workdir}/iso-graft/content/repo remote add ostree-mirror --set=gpg-verify=false ${ostree_repo}`
		`- runcmd ostree --repo=${workdir}/iso-graft/content/repo pull --mirror ostree-mirror ${ostree_ref}`
		`+ <%page args="root, ostree_osname, ostree_repo, ostree_ref"/>`
		`+ mkdir ostree`
		`+ runcmd ostree --repo=${root}/ostree/repo init --mode=bare`
		`+ runcmd ostree --repo=${root}/ostree/repo remote add ostree-mirror --set=gpg-verify=false ${ostree_repo}`
		`+ runcmd ostree --repo=${root}/ostree/repo pull --mirror ostree-mirror ${ostree_ref}`

otaylor commented 7 years ago

Make the same change as was done for atomic-host-installer in
e34c371, and move to a bare repository inside the squashfs, avoiding
name collisions on the Joliet filesystem.

https://pagure.io/workstation-ostree-config/issue/17

NOTE: this requires changes to the pungi configuration. See:

https://pagure.io/pungi-fedora/pull-request/108

and the last comment there.