[Fai-commit] r3612 - people/eartoast/features/clean-rcs/lib

[fai-commit at lists.alioth.debian.org]

Author: glaweh-guest
Date: 2006-07-22 13:23:03 +0000 (Sat, 22 Jul 2006)
New Revision: 3612

Modified:
   people/eartoast/features/clean-rcs/lib/get-config-dir
Log:
argh. not a sub anymore.


Modified: people/eartoast/features/clean-rcs/lib/get-config-dir
===================================================================
--- people/eartoast/features/clean-rcs/lib/get-config-dir	2006-07-22 12:44:10 UTC (rev 3611)
+++ people/eartoast/features/clean-rcs/lib/get-config-dir	2006-07-22 13:23:03 UTC (rev 3612)
@@ -1,32 +1,29 @@
 #!/bin/bash
-get_fai_dir() {
 
-    # get /fai directory, using the method specified in $FAI_CONFIG_METHOD
+# get /fai directory, using the method specified in $FAI_CONFIG_METHOD
 
-    [ -f /boot/RUNNING_FROM_FAICD ] && mkrw -s 100m $FAI
-    # now you have enough time to make changes to the config space
-    if [ -n "$fl_wait" ]; then
+[ -f /boot/RUNNING_FROM_FAICD ] && mkrw -s 100m $FAI
+# now you have enough time to make changes to the config space
+if [ -n "$fl_wait" ]; then
 	echo "Sleeping. Now you may change the config space in $FAI."
 	echo "Continue after killall sleep."
 	sleep 50000
-    fi
+fi
 
-	if [ -z "$FAI_CONFIG_METHOD" ]; then
-		sndmon "TASKERROR get_fai_dir 21"
-		die "Error: Provide the method to obtain the fai config storage in \$FAI_CONFIG_METHOD"
-	fi
+if [ -z "$FAI_CONFIG_METHOD" ]; then
+	sndmon "TASKERROR get_fai_dir 21"
+	die "Error: Provide the method to obtain the fai config storage in \$FAI_CONFIG_METHOD"
+fi
 
-	# HG: run get-fai-$blah script if it exists
-	if which get-config-dir-$FAI_CONFIG_METHOD &>/dev/null ; then
-		get-config-dir-$FAI_CONFIG_METHOD
-	else
-		sndmon "TASKERROR get_fai_dir 22"
-		die "Error: get-config-dir-$FAI_CONFIG_METHOD not found"
-	fi
-	
-    ln -s $FAI $rundir/current_config
-    if [ ! -d $FAI/class ]; then
+# HG: run get-fai-$blah script if it exists
+if which get-config-dir-$FAI_CONFIG_METHOD &>/dev/null ; then
+	get-config-dir-$FAI_CONFIG_METHOD
+else
+	sndmon "TASKERROR get_fai_dir 22"
+	die "Error: get-config-dir-$FAI_CONFIG_METHOD not found"
+fi
+
+ln -s $FAI $rundir/current_config
+if [ ! -d $FAI/class ]; then
 	echo "WARNING: directory $FAI/class not found."
-    fi
-}
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+fi