| |
@@ -10,13 +10,13 @@
|
| |
## - ostree_install_ref - the ref to use when creating the ISO
|
| |
## - ostree_update_ref - the ref to use for updates of an installed system
|
| |
|
| |
- <%page args="ostree_osname, ostree_install_repo, ostree_update_repo, ostree_install_ref, ostree_update_ref"/>
|
| |
+ <%page args="ostree_osname, ostree_install_repo, ostree_update_repo, ostree_install_ref, ostree_update_ref, ostree_oskey"/>
|
| |
append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=${ostree_osname} --remote=${ostree_osname} --url=file:///ostree/repo --ref=${ostree_update_ref}"
|
| |
append usr/share/anaconda/interactive-defaults.ks "firewall --use-system-defaults"
|
| |
|
| |
append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail"
|
| |
append usr/share/anaconda/interactive-defaults.ks "rm -f /etc/ostree/remotes.d/${ostree_osname}.conf"
|
| |
- append usr/share/anaconda/interactive-defaults.ks "ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary ${ostree_osname} '${ostree_update_repo}'"
|
| |
+ append usr/share/anaconda/interactive-defaults.ks "ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-${ostree_oskey} ${ostree_osname} '${ostree_update_repo}'"
|
| |
append usr/share/anaconda/interactive-defaults.ks "cp /etc/skel/.bash* /root"
|
| |
append usr/share/anaconda/interactive-defaults.ks "%end"
|
| |
|
| |
pbrobinson
commented 5 years ago
The keys are the only thing that is release specific, by pasing they key
from the pungi config it means the version components are all contained
in the one config.
Signed-off-by: Peter Robinson pbrobinson@gmail.com