[Fai-commit] r3821 - trunk/lib

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

Author: lange
Date: 2006-09-03 22:16:45 +0000 (Sun, 03 Sep 2006)
New Revision: 3821

Modified:
   trunk/lib/get-config-dir
   trunk/lib/subroutines-linux
Log:
move code from script get-config-dir to task_confdir()


Modified: trunk/lib/get-config-dir
===================================================================
--- trunk/lib/get-config-dir	2006-09-03 22:02:29 UTC (rev 3820)
+++ trunk/lib/get-config-dir	2006-09-03 22:16:45 UTC (rev 3821)
@@ -9,14 +9,6 @@
 # Short-Description: get $FAI directory from $FAI_CONFIG_SRC
 ### END SUBROUTINE INFO
 
-[ $DO_INIT_TASKS -eq 1 ] && 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
-
 if [ -z "$FAI_CONFIG_SRC" ]; then
 	sndmon "TASKERROR get_fai_dir 21"
 	die "Error: Provide the URL to obtain the fai config storage in \$FAI_CONFIG_SRC"

Modified: trunk/lib/subroutines-linux
===================================================================
--- trunk/lib/subroutines-linux	2006-09-03 22:02:29 UTC (rev 3820)
+++ trunk/lib/subroutines-linux	2006-09-03 22:16:45 UTC (rev 3821)
@@ -46,7 +46,7 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ### BEGIN SUBROUTINE INFO
 # Provides-Var:    $faimond $sndhostname
-# Requires-Var:    $LOGDIR
+# Requires-Var:    $LOGDIR $FAI
 # Suggests-Var:    $monserver
 # Short-Description: <task desc.>
 ### END SUBROUTINE INFO
@@ -67,9 +67,16 @@
 	klogd -c7 -f $LOGDIR/kernel.log
 	syslogd -m 0
         create_resolv_conf
+	mkrw -s 100m $FAI
     fi
     define_fai_flags
     get-config-dir
+    # 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
 
     # check if monitor server is available
     [ -z "$monserver" ] && monserver=$SERVER