From 0aafbdc2a278b26f7cdd48b9805e9cca9d500ac4 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Wed, 15 Jul 2015 19:43:04 -0500 Subject: [PATCH] f23 is no longer rawhide I changed the scripts that clearly stated where rawhide references were to be commented out, but there are some rawhide references in atomic stuff that may or may not need to be changed. --- fedora-install-cloud.ks | 8 ++++---- fedora-install-server.ks | 8 ++++---- fedora-install-workstation.ks | 8 ++++---- fedora-repo.ks | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/fedora-install-cloud.ks b/fedora-install-cloud.ks index 6a8da33..9571182 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 --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 +#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 --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 +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 eb820d5..5557948 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 --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 +#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 --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 +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 0c8ca76..aa9a572 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 --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 +#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 --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 +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 diff --git a/fedora-repo.ks b/fedora-repo.ks index 9c7dfff..92d4d65 100644 --- a/fedora-repo.ks +++ b/fedora-repo.ks @@ -3,7 +3,7 @@ # Exactly one of the following should be uncommented # For the master branch the following should be uncommented -%include fedora-repo-rawhide.ks +# %include fedora-repo-rawhide.ks # For non-master branches the following should be uncommented -# %include fedora-repo-not-rawhide.ks +%include fedora-repo-not-rawhide.ks