From addec6bdb285c639fb51b450c6253669491731b4 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 13 Mar 2017 12:55:13 -0400 Subject: [PATCH] atomic/host: Update to use new ISO model (in fedora.conf) This is a rework of , and re-applied from since I found out that in fact `fedora-atomic.conf` isn't used in this branch. Note that I left a few things like git branches pointed at f26, but I think these should be master most likely. Signed-off-by: Colin Walters --- fedora.conf | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/fedora.conf b/fedora.conf index 47d9c63..6f41f92 100644 --- a/fedora.conf +++ b/fedora.conf @@ -673,17 +673,13 @@ ostree_installer = [ "source_repo_from": "Everything", "release": None, "installpkgs": ["fedora-productimg-atomic"], - "add_template": ["atomic-installer/lorax-configure-repo.tmpl"], + "add_template": ["atomic-installer/lorax-configure-repo.tmpl", + "atomic-installer/lorax-embed-repo.tmpl"], "add_template_var": [ - "ostree_osname=fedora-atomic", - "ostree_ref=fedora/rawhide/x86_64/atomic-host", - ], - "add_arch_template": ["atomic-installer/lorax-embed-repo.tmpl"], - "add_arch_template_var": [ "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/", "ostree_osname=fedora-atomic", "ostree_ref=fedora/rawhide/x86_64/atomic-host", - ] + ], 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', 'template_branch': 'master', 'failable': ['*'],