4 files changed, 46 insertions, 25 deletions
diff --git a/base/all/root/scripts/install_gpfs.sh b/base/all/root/scripts/install_clusterfs_gpfs.sh
index 39b0827..86eadcb 100755
--- a/base/all/root/scripts/install_gpfs.sh
+++ b/base/all/root/scripts/install_clusterfs_gpfs.sh
@@ -1,11 +1,10 @@
 #!/bin/sh
 
-# we have to force the base GPFS package first, due to the way gpfs updates work
+# Must force the base GPFS package first, due to the way GPFS updates
+# work.
 echo "Installing GPFS base"
 yum -y install gpfs.base-@@GPFS_BASE_VERSION@@.@@RHEL_ARCH@@
 
-# then update it
-
 echo "Updating GPFS base"
 yum -y update
 
diff --git a/base/all/root/scripts/install_gpfs_nas.sh b/base/all/root/scripts/install_gpfs_nas.sh
deleted file mode 100755
index e971008..0000000
--- a/base/all/root/scripts/install_gpfs_nas.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# Make this explicit so we only get RHEL updates to make things nice
-# and clear.  This duplicates what happens in basic-postinstall.sh but
-# we may have just rewound the cluster, so we might be running this on
-# the node install of from kickstart.
-echo "Updating from YUM repositories"
-yum -y update
-
-$(dirname $0)/install_gpfs.sh
-
-echo "Installing tdb tools packages"
-yum -y install tdb-tools
-
-echo "Installing ctdb packages"
-yum -y install ctdb ctdb-debuginfo ctdb-devel ctdb-tests
-
-echo "Installing samba packages"
-yum -y install samba samba-debuginfo samba-client samba-doc
-
-echo "Installing rssh"
-yum -y install rssh
diff --git a/base/all/root/scripts/install_nas.sh b/base/all/root/scripts/install_nas.sh
new file mode 100755
index 0000000..32425ec
--- /dev/null
+++ b/base/all/root/scripts/install_nas.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+echo "Installing tdb tools packages"
+yum -y install tdb-tools
+
+echo "Installing ctdb packages"
+yum -y install ctdb ctdb-debuginfo ctdb-devel ctdb-tests
+
+echo "Installing samba packages"
+yum -y install samba samba-debuginfo samba-client samba-doc
+
+echo "Installing rssh"
+yum -y install rssh
diff --git a/base/all/root/scripts/install_packages.sh b/base/all/root/scripts/install_packages.sh
new file mode 100755
index 0000000..9b023c0
--- /dev/null
+++ b/base/all/root/scripts/install_packages.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+echo "Updating from YUM repositories"
+yum -y update
+
+extra_packages="@@CONFIG_EXTRA_PACKAGES@@"
+if [ -n "$extra_packages" ] ; then
+    yum -y install $extra_packages
+fi
+
+dn=$(dirname $0)
+
+for task ; do
+    case "$task" in
+	clusterfs)
+	    type="@@CLUSTERFS_TYPE@@"
+	    file="install_clusterfs_${type}.sh"
+	    ;;
+	*)
+	    file="install_${task}.sh"
+    esac
+
+    path="${dn}/${file}"
+
+    if [ ! -x "$path" ] ; then
+	echo "Unable to find script \"${file}\" to install task \"${task}\""
+	exit 1
+    fi
+
+    "$path"
+done