kexclude->yumexclude

diff --git a/bootstrapfs.spec b/bootstrapfs.spec
index f2a15db..26eb631 100644 (file)
--- a/bootstrapfs.spec
+++ b/bootstrapfs.spec
@@ -84,13 +84,13 @@ pushd bootstrapfs/nodeconfig/yum
 # scan fcdistros and catenate all repos in 'stock.repo' so db-config can be distro-independant
 for fcdistro in $(ls); do
     [ -d $fcdistro ] || continue
-    # get kexcludes for that distro
-    KEXCLUDE="exclude=$(../../../build/getkexcludes.sh -f $fcdistro)"
+    # get packages to exclude on nodes for that fcdistro/pldistro
+    NODEYUMEXCLUDE="exclude=$(../../../build/nodeyumexcludes.sh $fcdistro $pldistro)"
     pushd $fcdistro/yum.myplc.d
-    echo "* Handling KEXCLUDE in yum repo for $fcdistro ($KEXCLUDE)"
+    echo "* Handling NODEYUMEXCLUDE in yum repo for $fcdistro/$pldistro ($NODEYUMEXCLUDE)"
     for filein in $(find . -name '*.in') ; do
        file=$(echo $filein | sed -e "s,\.in$,,")
-       sed -e "s,@KEXCLUDE@,$KEXCLUDE,g" $filein > $file
+       sed -e "s,@NODEYUMEXCLUDE@,$NODEYUMEXCLUDE,g" $filein > $file
     done
     rm -f stock.repo
     cat *.repo > stock.repo

diff --git a/nodeconfig/yum/centos5/yum.myplc.d/CentOS-Base.repo.in b/nodeconfig/yum/centos5/yum.myplc.d/CentOS-Base.repo.in
index c45b976..0b2e81f 100644 (file)
--- a/nodeconfig/yum/centos5/yum.myplc.d/CentOS-Base.repo.in
+++ b/nodeconfig/yum/centos5/yum.myplc.d/CentOS-Base.repo.in
@@ -1,4 +1,3 @@
-# $URL$
 # CentOS-Base.repo
 #
 # This file uses a new mirrorlist system developed by Lance Davis for CentOS.
@@ -16,7 +15,7 @@
 name=CentOS-$releasever - Base
 mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os
 #baseurl=http://mirror.centos.org/centos/$releasever/os/$basearch/
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 gpgcheck=1
 enabled=1
 gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-5
@@ -26,7 +25,7 @@ gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-5
 name=CentOS-$releasever - Updates
 mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates
 #baseurl=http://mirror.centos.org/centos/$releasever/updates/$basearch/
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 gpgcheck=1
 enabled=1
 gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-5
@@ -36,7 +35,7 @@ gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-5
 name=CentOS-$releasever - Addons
 mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=addons
 #baseurl=http://mirror.centos.org/centos/$releasever/addons/$basearch/
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 gpgcheck=1
 enabled=0
 gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-5
@@ -46,7 +45,7 @@ gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-5
 name=CentOS-$releasever - Extras
 mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras
 #baseurl=http://mirror.centos.org/centos/$releasever/extras/$basearch/
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 gpgcheck=1
 enabled=0
 gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-5
@@ -56,7 +55,7 @@ gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-5
 name=CentOS-$releasever - Plus
 mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus
 #baseurl=http://mirror.centos.org/centos/$releasever/centosplus/$basearch/
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 gpgcheck=1
 enabled=0
 gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-5

diff --git a/nodeconfig/yum/centos5/yum.myplc.d/epel.repo.in b/nodeconfig/yum/centos5/yum.myplc.d/epel.repo.in
index 7c8159f..b174de4 100644 (file)
--- a/nodeconfig/yum/centos5/yum.myplc.d/epel.repo.in
+++ b/nodeconfig/yum/centos5/yum.myplc.d/epel.repo.in
@@ -1,10 +1,9 @@
-# $URL$
 [epel]
 name=Extra Packages for Enterprise Linux 5 - $basearch
 #baseurl=http://download.fedoraproject.org/pub/epel/5/$basearch
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch
 failovermethod=priority
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL
@@ -14,7 +13,7 @@ name=Extra Packages for Enterprise Linux 5 - $basearch - Debug
 #baseurl=http://download.fedoraproject.org/pub/epel/5/$basearch/debug
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-5&arch=$basearch
 failovermethod=priority
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL
 gpgcheck=1
@@ -24,7 +23,7 @@ name=Extra Packages for Enterprise Linux 5 - $basearch - Source
 #baseurl=http://download.fedoraproject.org/pub/epel/5/SRPMS
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-5&arch=$basearch
 failovermethod=priority
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL
 gpgcheck=1

diff --git a/nodeconfig/yum/f10/yum.myplc.d/fedora-updates.repo.in b/nodeconfig/yum/f10/yum.myplc.d/fedora-updates.repo.in
index 04de1a3..04935eb 100644 (file)
--- a/nodeconfig/yum/f10/yum.myplc.d/fedora-updates.repo.in
+++ b/nodeconfig/yum/f10/yum.myplc.d/fedora-updates.repo.in
@@ -1,10 +1,9 @@
-# $URL$
 [updates]
 name=Fedora $releasever - $basearch - Updates
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
@@ -14,7 +13,7 @@ name=Fedora $releasever - $basearch - Updates - Debug
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch/debug/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
@@ -24,7 +23,7 @@ name=Fedora $releasever - Updates Source
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/SRPMS/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora

diff --git a/nodeconfig/yum/f10/yum.myplc.d/fedora.repo.in b/nodeconfig/yum/f10/yum.myplc.d/fedora.repo.in
index e7db63d..15313be 100644 (file)
--- a/nodeconfig/yum/f10/yum.myplc.d/fedora.repo.in
+++ b/nodeconfig/yum/f10/yum.myplc.d/fedora.repo.in
@@ -1,10 +1,9 @@
-# $URL$
 [fedora]
 name=Fedora $releasever - $basearch
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
@@ -14,7 +13,7 @@ name=Fedora $releasever - $basearch - Debug
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
@@ -24,7 +23,7 @@ name=Fedora $releasever - Source
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/source/SRPMS/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY

diff --git a/nodeconfig/yum/f12/yum.myplc.d/fedora-updates.repo.in b/nodeconfig/yum/f12/yum.myplc.d/fedora-updates.repo.in
index 04de1a3..04935eb 100644 (file)
--- a/nodeconfig/yum/f12/yum.myplc.d/fedora-updates.repo.in
+++ b/nodeconfig/yum/f12/yum.myplc.d/fedora-updates.repo.in
@@ -1,10 +1,9 @@
-# $URL$
 [updates]
 name=Fedora $releasever - $basearch - Updates
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
@@ -14,7 +13,7 @@ name=Fedora $releasever - $basearch - Updates - Debug
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch/debug/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
@@ -24,7 +23,7 @@ name=Fedora $releasever - Updates Source
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/SRPMS/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora

diff --git a/nodeconfig/yum/f12/yum.myplc.d/fedora.repo.in b/nodeconfig/yum/f12/yum.myplc.d/fedora.repo.in
index e7db63d..15313be 100644 (file)
--- a/nodeconfig/yum/f12/yum.myplc.d/fedora.repo.in
+++ b/nodeconfig/yum/f12/yum.myplc.d/fedora.repo.in
@@ -1,10 +1,9 @@
-# $URL$
 [fedora]
 name=Fedora $releasever - $basearch
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
@@ -14,7 +13,7 @@ name=Fedora $releasever - $basearch - Debug
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
@@ -24,7 +23,7 @@ name=Fedora $releasever - Source
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/source/SRPMS/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY

diff --git a/nodeconfig/yum/f14/yum.myplc.d/fedora-updates.repo.in b/nodeconfig/yum/f14/yum.myplc.d/fedora-updates.repo.in
index c3c031a..d57768f 100644 (file)
--- a/nodeconfig/yum/f14/yum.myplc.d/fedora-updates.repo.in
+++ b/nodeconfig/yum/f14/yum.myplc.d/fedora-updates.repo.in
@@ -3,7 +3,7 @@ name=Fedora $releasever - $basearch - Updates
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
@@ -13,7 +13,7 @@ name=Fedora $releasever - $basearch - Updates - Debug
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch/debug/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
@@ -23,7 +23,7 @@ name=Fedora $releasever - Updates Source
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/SRPMS/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch

diff --git a/nodeconfig/yum/f14/yum.myplc.d/fedora.repo.in b/nodeconfig/yum/f14/yum.myplc.d/fedora.repo.in
index b4f2b15..1abf007 100644 (file)
--- a/nodeconfig/yum/f14/yum.myplc.d/fedora.repo.in
+++ b/nodeconfig/yum/f14/yum.myplc.d/fedora.repo.in
@@ -3,7 +3,7 @@ name=Fedora $releasever - $basearch
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
@@ -13,7 +13,7 @@ name=Fedora $releasever - $basearch - Debug
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=0
 metadata_expire=7d
 gpgcheck=1
@@ -24,7 +24,7 @@ name=Fedora $releasever - Source
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/source/SRPMS/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=0
 metadata_expire=7d
 gpgcheck=1

diff --git a/nodeconfig/yum/f8/yum.myplc.d/fedora-updates.repo.in b/nodeconfig/yum/f8/yum.myplc.d/fedora-updates.repo.in
index 28f612a..a74512d 100644 (file)
--- a/nodeconfig/yum/f8/yum.myplc.d/fedora-updates.repo.in
+++ b/nodeconfig/yum/f8/yum.myplc.d/fedora-updates.repo.in
@@ -1,10 +1,9 @@
-# $URL$
 [updates]
 name=Fedora $releasever - $basearch - Updates
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
@@ -14,7 +13,7 @@ name=Fedora $releasever - $basearch - Updates - Debug
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch/debug/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
@@ -24,7 +23,7 @@ name=Fedora $releasever - Updates Source
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/SRPMS/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
@@ -34,7 +33,7 @@ name=Fedora $releasever - $basearch - Updates Newkey
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch.newkey/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever.newkey&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-8-and-9
@@ -44,7 +43,7 @@ name=Fedora $releasever - $basearch - Updates - Debug Newkey
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch.newkey/debug/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f$releasever.newkey&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-8-and-9
@@ -54,7 +53,7 @@ name=Fedora $releasever - Updates Source Newkey
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/SRPMS.newkey/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f$releasever.newkey&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-8-and-9

diff --git a/nodeconfig/yum/f8/yum.myplc.d/fedora.repo.in b/nodeconfig/yum/f8/yum.myplc.d/fedora.repo.in
index e7db63d..15313be 100644 (file)
--- a/nodeconfig/yum/f8/yum.myplc.d/fedora.repo.in
+++ b/nodeconfig/yum/f8/yum.myplc.d/fedora.repo.in
@@ -1,10 +1,9 @@
-# $URL$
 [fedora]
 name=Fedora $releasever - $basearch
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
@@ -14,7 +13,7 @@ name=Fedora $releasever - $basearch - Debug
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
@@ -24,7 +23,7 @@ name=Fedora $releasever - Source
 failovermethod=priority
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/source/SRPMS/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY

diff --git a/nodeconfig/yum/sl6/yum.myplc.d/epel.repo.in b/nodeconfig/yum/sl6/yum.myplc.d/epel.repo.in
index 5fcb3a5..4a46551 100644 (file)
--- a/nodeconfig/yum/sl6/yum.myplc.d/epel.repo.in
+++ b/nodeconfig/yum/sl6/yum.myplc.d/epel.repo.in
@@ -4,7 +4,7 @@ name=Extra Packages for Enterprise Linux 6 - $basearch
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch
 failovermethod=priority
 enabled=1
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6
 
@@ -14,7 +14,7 @@ name=Extra Packages for Enterprise Linux 6 - $basearch - Debug
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-6&arch=$basearch
 failovermethod=priority
 enabled=0
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6
 gpgcheck=1
 
@@ -24,6 +24,6 @@ name=Extra Packages for Enterprise Linux 6 - $basearch - Source
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-source-6&arch=$basearch
 failovermethod=priority
 enabled=0
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6
 gpgcheck=1

diff --git a/nodeconfig/yum/sl6/yum.myplc.d/sl-updates.repo b/nodeconfig/yum/sl6/yum.myplc.d/sl-updates.repo
index df049ef..9c91bd2 100644 (file)
--- a/nodeconfig/yum/sl6/yum.myplc.d/sl-updates.repo
+++ b/nodeconfig/yum/sl6/yum.myplc.d/sl-updates.repo
@@ -6,7 +6,7 @@ baseurl=http://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/up
                ftp://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/security/
 #mirrorlist=http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-security-6.txt
 enabled=1
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
 
@@ -18,7 +18,7 @@ baseurl=http://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/up
                ftp://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
 #mirrorlist=http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-fastbugs-6.txt
 enabled=0
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
 

diff --git a/nodeconfig/yum/sl6/yum.myplc.d/sl.repo.in b/nodeconfig/yum/sl6/yum.myplc.d/sl.repo.in
index eb98326..b222eb2 100644 (file)
--- a/nodeconfig/yum/sl6/yum.myplc.d/sl.repo.in
+++ b/nodeconfig/yum/sl6/yum.myplc.d/sl.repo.in
@@ -6,7 +6,7 @@ baseurl=http://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/os
                ftp://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/os/
 #mirrorlist=http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-base-6.txt
 enabled=1
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
 
@@ -27,7 +27,7 @@ baseurl=http://ftp.scientificlinux.org/linux/scientific/$releasever/SRPMS/
                http://ftp2.scientificlinux.org/linux/scientific/$releasever/SRPMS/
                ftp://ftp.scientificlinux.org/linux/scientific/$releasever/SRPMS/
 enabled=0
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
 
@@ -38,7 +38,7 @@ baseurl=http://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
                http://ftp2.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
                ftp://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
 enabled=0
-@KEXCLUDE@
+@NODEYUMEXCLUDE@
 gpgcheck0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson