From 6f2f62a859cbd31dbb1e8850c70df2822a560dc1 Mon Sep 17 00:00:00 2001
From: Martin Schwenke <martin@meltin.net>
Date: Tue, 29 Jul 2014 12:12:05 +1000
Subject: [PATCH] Move cluster_setup.sh task scriptlets to tasks subdirectory

Signed-off-by: Martin Schwenke <martin@meltin.net>
---
 base/all/root/scripts/cluster_setup.sh                      | 2 +-
 base/all/root/scripts/{ => tasks}/install_ad.sh             | 0
 base/all/root/scripts/{ => tasks}/install_build.sh          | 4 ++--
 base/all/root/scripts/{ => tasks}/install_clusterfs_gpfs.sh | 0
 base/all/root/scripts/{ => tasks}/install_extra_packages.sh | 0
 base/all/root/scripts/{ => tasks}/install_nas.sh            | 0
 base/all/root/scripts/{ => tasks}/setup_cluster_nas.sh      | 0
 base/all/root/scripts/{ => tasks}/setup_clusterfs_gpfs.sh   | 6 +++---
 base/all/root/scripts/{ => tasks}/setup_node_ad.sh          | 0
 base/all/root/scripts/{ => tasks}/setup_node_build.sh       | 0
 base/all/root/scripts/{ => tasks}/setup_node_nas.sh         | 0
 11 files changed, 6 insertions(+), 6 deletions(-)
 rename base/all/root/scripts/{ => tasks}/install_ad.sh (100%)
 rename base/all/root/scripts/{ => tasks}/install_build.sh (77%)
 rename base/all/root/scripts/{ => tasks}/install_clusterfs_gpfs.sh (100%)
 rename base/all/root/scripts/{ => tasks}/install_extra_packages.sh (100%)
 rename base/all/root/scripts/{ => tasks}/install_nas.sh (100%)
 rename base/all/root/scripts/{ => tasks}/setup_cluster_nas.sh (100%)
 rename base/all/root/scripts/{ => tasks}/setup_clusterfs_gpfs.sh (99%)
 rename base/all/root/scripts/{ => tasks}/setup_node_ad.sh (100%)
 rename base/all/root/scripts/{ => tasks}/setup_node_build.sh (100%)
 rename base/all/root/scripts/{ => tasks}/setup_node_nas.sh (100%)

diff --git a/base/all/root/scripts/cluster_setup.sh b/base/all/root/scripts/cluster_setup.sh
index 28f42f7..302c577 100755
--- a/base/all/root/scripts/cluster_setup.sh
+++ b/base/all/root/scripts/cluster_setup.sh
@@ -24,7 +24,7 @@ for task ; do
 	    file="${prefix}_${task}.sh"
     esac
 
-    path="${dn}/${file}"
+    path="${dn}/tasks/${file}"
 
     if [ ! -x "$path" ] ; then
 	echo "Unable to find script \"${file}\" for stage \"${stage}\" task \"${task}\""
diff --git a/base/all/root/scripts/install_ad.sh b/base/all/root/scripts/tasks/install_ad.sh
similarity index 100%
rename from base/all/root/scripts/install_ad.sh
rename to base/all/root/scripts/tasks/install_ad.sh
diff --git a/base/all/root/scripts/install_build.sh b/base/all/root/scripts/tasks/install_build.sh
similarity index 77%
rename from base/all/root/scripts/install_build.sh
rename to base/all/root/scripts/tasks/install_build.sh
index 9857e08..73bf651 100755
--- a/base/all/root/scripts/install_build.sh
+++ b/base/all/root/scripts/tasks/install_build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Setup RPM development                                                         
+# Setup RPM development
 echo "Installing RPM developing and setting up rpm build"
 yum -y install rpmdevtools
 
@@ -10,7 +10,7 @@ yum -y install rpmdevtools
 echo "Installing PCP development libraries - this may fail"
 yum -y install pcp-libs pcp-libs-devel
 
-# Packages required for samba development                                       
+# Packages required for samba development
 echo "Installing Samba build dependencies"
 yum -y install readline-devel libacl-devel e2fsprogs-devel \
     libxslt docbook-utils docbook-style-xsl
diff --git a/base/all/root/scripts/install_clusterfs_gpfs.sh b/base/all/root/scripts/tasks/install_clusterfs_gpfs.sh
similarity index 100%
rename from base/all/root/scripts/install_clusterfs_gpfs.sh
rename to base/all/root/scripts/tasks/install_clusterfs_gpfs.sh
diff --git a/base/all/root/scripts/install_extra_packages.sh b/base/all/root/scripts/tasks/install_extra_packages.sh
similarity index 100%
rename from base/all/root/scripts/install_extra_packages.sh
rename to base/all/root/scripts/tasks/install_extra_packages.sh
diff --git a/base/all/root/scripts/install_nas.sh b/base/all/root/scripts/tasks/install_nas.sh
similarity index 100%
rename from base/all/root/scripts/install_nas.sh
rename to base/all/root/scripts/tasks/install_nas.sh
diff --git a/base/all/root/scripts/setup_cluster_nas.sh b/base/all/root/scripts/tasks/setup_cluster_nas.sh
similarity index 100%
rename from base/all/root/scripts/setup_cluster_nas.sh
rename to base/all/root/scripts/tasks/setup_cluster_nas.sh
diff --git a/base/all/root/scripts/setup_clusterfs_gpfs.sh b/base/all/root/scripts/tasks/setup_clusterfs_gpfs.sh
similarity index 99%
rename from base/all/root/scripts/setup_clusterfs_gpfs.sh
rename to base/all/root/scripts/tasks/setup_clusterfs_gpfs.sh
index e7ea6cf..2b0df7c 100755
--- a/base/all/root/scripts/setup_clusterfs_gpfs.sh
+++ b/base/all/root/scripts/tasks/setup_clusterfs_gpfs.sh
@@ -24,7 +24,7 @@ dir=$(dirname "$0")
 # the script there.
 if [ -n "$nodes_storage_gpfs" -a \
     "${HOSTNAME%%.*}" != "${nodes_storage_gpfs%%[.,]*}" ] ; then
-    if [ "${0#/}" != "$0" ] ; then 
+    if [ "${0#/}" != "$0" ] ; then
 	script="$0"
     else
 	script="${PWD}/${0}"
@@ -169,7 +169,7 @@ gpfs_mkfs ()
     fi <"$nsdfile" >"$nsdfile2"
 
     chattr +i "$mountpoint"
-    
+
     mmcrfs gpfs0 -F "$nsdfile2" \
 	-A yes -Q yes -D nfs4 -B 64k -k nfs4 -n 32 -E yes -S no \
 	-T "$mountpoint" -i 512
@@ -179,7 +179,7 @@ gpfs_mkfs ()
 
 gpfs_mount ()
 {
-    echo 
+    echo
     echo "Mounting filesystem"
     mmmount gpfs0 -a
 
diff --git a/base/all/root/scripts/setup_node_ad.sh b/base/all/root/scripts/tasks/setup_node_ad.sh
similarity index 100%
rename from base/all/root/scripts/setup_node_ad.sh
rename to base/all/root/scripts/tasks/setup_node_ad.sh
diff --git a/base/all/root/scripts/setup_node_build.sh b/base/all/root/scripts/tasks/setup_node_build.sh
similarity index 100%
rename from base/all/root/scripts/setup_node_build.sh
rename to base/all/root/scripts/tasks/setup_node_build.sh
diff --git a/base/all/root/scripts/setup_node_nas.sh b/base/all/root/scripts/tasks/setup_node_nas.sh
similarity index 100%
rename from base/all/root/scripts/setup_node_nas.sh
rename to base/all/root/scripts/tasks/setup_node_nas.sh
-- 
2.34.1