Fix the state check in setup_gpfs.sh to be more robust. Change

invocation of "sofs config" in setup_samba.sh to "cnconfig".

Signed-off-by: Martin Schwenke <martin@meltin.net>

2 files changed, 12 insertions, 3 deletions

diff --git a/base/root/scripts/setup_gpfs.sh b/base/root/scripts/setup_gpfs.sh
index eece1a8..8ddae32 100755
--- a/base/root/scripts/setup_gpfs.sh
+++ b/base/root/scripts/setup_gpfs.sh
@@ -40,7 +40,16 @@ echo "Starting gpfs"
 mmstartup -a
 
 echo "Waiting for gpfs to become active"
-while ! mmgetstate | grep active > /dev/null; do echo -n "."; sleep 1; done
+count=0
+while  mmgetstate -a | tail -n +4 | grep -v " active" > /dev/null; do
+    echo -n "."
+    count=$(($count + 1))
+    if [ $count -gt 60 ] ; then
+	echo "TIMEOUT: gpfs didn't become active"
+	exit 1
+    fi
+    sleep 1
+done
 echo
 
 echo
diff --git a/base/root/scripts/setup_samba.sh b/base/root/scripts/setup_samba.sh
index eb3eaff..72f6acd 100755
--- a/base/root/scripts/setup_samba.sh
+++ b/base/root/scripts/setup_samba.sh
@@ -86,10 +86,10 @@ sleep 5
 killall smbd
 
 echo "Restoring base config"
-sofs conf restore "$conf_file"
+cnconfig restore "$conf_file"
 
 echo "Forcing config reload"
-sofs conf reload
+cnconfig reload
 
 echo "Joining domain"
 net ads join -U"$domain_auth"