From 6fc115ffbdc9e43f9db0ff1d338643f1abdf8d3b Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 24 Nov 2014 08:46:53 -0500 Subject: [PATCH] Work around pungi issue with productimg packages Pungi and lorax pull in the complete repository set and then try to load all possible fedora-productimg-* packages. We need to explicitly exclude the ones for the different products. --- fedora-install-cloud.ks | 8 ++++---- fedora-install-server.ks | 8 ++++---- fedora-install-workstation.ks | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/fedora-install-cloud.ks b/fedora-install-cloud.ks index ff63286..34f2d2a 100644 --- a/fedora-install-cloud.ks +++ b/fedora-install-cloud.ks @@ -16,12 +16,12 @@ # use the source repo, we can't just include fedora-repo.ks # In the master branch the rawhide repo commands should be uncommented. -repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch -repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch +repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server +repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server # In non-master branches the fedora repo commands should be uncommented -#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch -#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch +#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server +#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server # Package manifest for the compose. Uses repo group metadata to translate groups. # (default groups for the configured repos are added by --default) diff --git a/fedora-install-server.ks b/fedora-install-server.ks index 195e01d..8b1b9e6 100644 --- a/fedora-install-server.ks +++ b/fedora-install-server.ks @@ -16,12 +16,12 @@ # use the source repo, we can't just include fedora-repo.ks # In the master branch the rawhide repo commands should be uncommented. -repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch -repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch +repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation +repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation # In non-master branches the fedora repo commands should be uncommented -#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch -#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch +#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation +#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation # Package manifest for the compose. Uses repo group metadata to translate groups. # (default groups for the configured repos are added by --default) diff --git a/fedora-install-workstation.ks b/fedora-install-workstation.ks index 269ca80..52734ee 100644 --- a/fedora-install-workstation.ks +++ b/fedora-install-workstation.ks @@ -16,12 +16,12 @@ # use the source repo, we can't just include fedora-repo.ks # In the master branch the rawhide repo commands should be uncommented. -repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch -repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch +repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server +repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server # In non-master branches the fedora repo commands should be uncommented -#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch -#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch +#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server +#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server %include fedora-workstation-packages.ks