#18 rawhide: bring forward changes from f26/f25 to atomic lorax templates
Merged 6 years ago by ausil. Opened 6 years ago by dustymabe.
dustymabe/fedora-lorax-templates dusty-rawhide  into  master

@@ -4,8 +4,14 @@ 

  ##     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:///ostree/repo --ref=${ostree_ref}\n"

+ ## Args:

+ ##  - ostree_osname      - the name of the os/name of remote

+ ##  - ostree_repo        - the url of the remote

+ ##  - 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_repo, ostree_install_ref, ostree_update_ref"/>

+ append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=${ostree_osname} --remote=${ostree_osname} --url=file:///ostree/repo --ref=${ostree_update_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/'\ncp /etc/skel/.bash* /root\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} '${ostree_repo}'\ncp /etc/skel/.bash* /root\n%end\n"

  

@@ -4,8 +4,17 @@ 

  ## 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="root, ostree_osname, ostree_repo, ostree_ref"/>

- mkdir ostree

+ ## Args:

+ ##  - root               - the root directory of the iso tree

+ ##  - ostree_osname      - the name of the os/name of remote

+ ##  - ostree_repo        - the url of the remote

+ ##  - 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="root, ostree_osname, ostree_repo, ostree_install_ref, ostree_update_ref"/>

+ runcmd mkdir ${root}/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}

+ runcmd ostree --repo=${root}/ostree/repo remote add ${ostree_osname} --set=gpg-verify=false ${ostree_repo}

+ runcmd ostree --repo=${root}/ostree/repo pull --mirror ${ostree_osname} ${ostree_install_ref}

+ runcmd ostree --repo=${root}/ostree/repo refs ${ostree_install_ref} --create ${ostree_update_ref}

+ runcmd ostree --repo=${root}/ostree/repo summary -u

  • atomic: fixups for earlier move to ostree in root (from f26)
  • atomic: set up for 2wk updates (from f25)
  • atomic: add some documentation of arguments

rebased

6 years ago

Pull-Request has been merged by ausil

6 years ago