#32 Set contenturl in ostree remote config
Merged 5 years ago by puiterwijk. Opened 5 years ago by sinnykumari.
sinnykumari/fedora-lorax-templates master  into  master

@@ -9,6 +9,7 @@ 

  ##  - ostree_update_repo - the url of the remote for updates of an installed system

  ##  - ostree_install_ref - the ref to use when creating the ISO  

  ##  - ostree_update_ref  - the ref to use for updates of an installed system

+ ##  - ostree_contenturl    - the url to use for fetching content from mirrors/CDN

  

  <%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}"
@@ -16,7 +17,7 @@ 

  

  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-${ostree_oskey} ${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} --set=contenturl=${ostree_contenturl} ${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"

  

LGTM. Will merge when ready.

rebased onto f1741cf

5 years ago

Cosmetic update in commit message to reflect actual change

Pull-Request has been merged by puiterwijk

5 years ago
Metadata