summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2012-05-22 13:25:05 +1000
committerMartin Schwenke <martin@meltin.net>2012-05-22 13:25:05 +1000
commit289feae27f85d85716c72786def5071d21390ceb (patch)
tree1a031f9efe1f196ee0a37f724a12fe546f8165d4 /templates
parent95f3df5a7cf5f91e1c528a3cfe8b6824a5f62509 (diff)
parentc7c23bc5300f90a4050ba21de2984e5f1efbbf22 (diff)
downloadautocluster-289feae27f85d85716c72786def5071d21390ceb.tar.gz
autocluster-289feae27f85d85716c72786def5071d21390ceb.tar.xz
autocluster-289feae27f85d85716c72786def5071d21390ceb.zip
Merge remote-tracking branch 'amitay/master'
Diffstat (limited to 'templates')
-rw-r--r--templates/RHEL.repo2
-rw-r--r--templates/gpfs-nas-kickstart.cfg7
-rw-r--r--templates/kickstart-SoFS.cfg3
3 files changed, 2 insertions, 10 deletions
diff --git a/templates/RHEL.repo b/templates/RHEL.repo
index 3804e61..94799fa 100644
--- a/templates/RHEL.repo
+++ b/templates/RHEL.repo
@@ -3,9 +3,11 @@ name=Red Hat Enterprise Linux @@RHEL_VERSION@@
baseurl=@@INSTALL_SERVER@@/RHEL@@RHEL_VERSION@@/@@RHEL_ARCH@@/
enabled=1
gpgcheck=0
+exclude=samba*,libsmbclient*,ctdb*
[RHEL@@RHEL_VERSION@@-updates]
name=Red Hat Enterprise Linux @@RHEL_VERSION@@ - updates
baseurl=@@INSTALL_SERVER@@/RHEL@@RHEL_VERSION@@-updates/@@RHEL_ARCH@@/
enabled=0
gpgcheck=0
+exclude=samba*,libsmbclient*,ctdb*
diff --git a/templates/gpfs-nas-kickstart.cfg b/templates/gpfs-nas-kickstart.cfg
index fd468a2..56da40d 100644
--- a/templates/gpfs-nas-kickstart.cfg
+++ b/templates/gpfs-nas-kickstart.cfg
@@ -175,13 +175,6 @@ cat >/etc/profile.d/gpfs-autocluster.sh <<EOF
pathmunge /usr/lpp/mmfs/bin
EOF
-###
-echo "Excluding RHEL's samba packages via YUM config..."
-cat >>/etc/yum.conf <<EOF
-# Added by autocluster
-exclude=samba*el[56]*
-EOF
-
@@@STANDARD_POSTINSTALL@@@
@@@POSTINSTALL_TEMPLATE@@@
diff --git a/templates/kickstart-SoFS.cfg b/templates/kickstart-SoFS.cfg
index 900ae74..44cf8ac 100644
--- a/templates/kickstart-SoFS.cfg
+++ b/templates/kickstart-SoFS.cfg
@@ -182,9 +182,6 @@ echo 'if ! echo ${PATH} | grep -q /usr/lpp/mmfs/bin ; then
fi
'>/etc/profile.d/sofs_profile.sh
-# add following line to /etc/yum.conf
-echo "exclude=samba*el5*" >>/etc/yum.conf
-
@@@STANDARD_POSTINSTALL@@@
@@@POSTINSTALL_TEMPLATE@@@