PR#7: Strip OSTree signatures for now - fedora-lorax-templates

Colin Walters • 7 years ago

7b46652

Colin Walters • 7 years ago

48a8fec

Ray Strode • 7 years ago

318a638

Dennis Gilmore • 7 years ago

1a9611a

Peter Robinson • 7 years ago

26f395d

file modified

+6 -3

		`@@ -1,8 +1,11 @@`
		`- ## Lorax template to configure Anaconda to use the local OSTree`
		`- ## repository on disk.`
		`+ ## Lorax template to configure Anaconda to:`
		`+ ## 1) Use the repository we embedded in the ISO`
		`+ ## 2) Disable cloud-init (since we don't use it in the Anaconda path)`
		`+ ## but the package enables itself by default`
		`+ ## 3) Work around https://bugzilla.redhat.com/show_bug.cgi?id=1193590`

		`<%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 "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 fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/rawhide/'\n%end\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 fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/25/'\ncp /etc/skel/.bash* /root\n%end\n"`

atomic-installer/lorax-embed-repo.tmpl

file modified

		`@@ -9,3 +9,4 @@`
		`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}`
		`+ runcmd find ${workdir}/iso-graft/content/repo/objects -name '*.commitmeta' -delete`

file modified

+1 -1

		`@@ -4,5 +4,5 @@`
		`<%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 "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 fedora-atomic 'https://kojipkgs.fedoraproject.org/compose/ostree/rawhide/'\n%end\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/25/'\n%end\n"`

file modified

		`@@ -9,3 +9,4 @@`
		`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}`
		`+ runcmd find ${workdir}/iso-graft/content/repo/objects -name '*.commitmeta' -delete`