[Fai-commit] r3850 - in trunk: bin lib

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

Author: lange
Date: 2006-09-05 12:05:49 +0000 (Tue, 05 Sep 2006)
New Revision: 3850

Modified:
   trunk/bin/fai
   trunk/lib/get-config-dir
Log:
replace $rundir by fixed path


Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2006-09-05 12:04:39 UTC (rev 3849)
+++ trunk/bin/fai	2006-09-05 12:05:49 UTC (rev 3850)
@@ -31,8 +31,8 @@
 export PATH=/usr/local/sbin:/usr/local/bin:/usr/lib/fai:/bin:/sbin:/usr/bin:/usr/sbin:
 # some variables
 export FAI_VERSION=FAIVERSIONSTRING
-export rundir=/var/run/fai
-stamp=$rundir/FAI_INSTALLATION_IN_PROGRESS
+ rundir=/var/run/fai
+stamp=/var/run/fai/FAI_INSTALLATION_IN_PROGRESS
 romountopt="-o async,noatime,nolock,ro,actimeo=1800"
 
 # the type of operating system (linux, sunos)
@@ -273,6 +273,6 @@
 unset action
 task action 2>&1 | tee -a $LOGDIR/fai.log
 
-[ -L "$rundir/current_config" ] && rm -f "$rundir/current_config"
+[ -L "/var/run/fai/current_config" ] && rm -f "/var/run/fai/current_config"
 
 echo "End of $0"

Modified: trunk/lib/get-config-dir
===================================================================
--- trunk/lib/get-config-dir	2006-09-05 12:04:39 UTC (rev 3849)
+++ trunk/lib/get-config-dir	2006-09-05 12:05:49 UTC (rev 3850)
@@ -4,7 +4,7 @@
 
 ### BEGIN SUBROUTINE INFO
 # Provides-Var:
-# Requires-Var:    $FAI_CONFIG_SRC $FAI $rundir
+# Requires-Var:    $FAI_CONFIG_SRC $FAI
 # Suggests-Var:
 # Short-Description: get $FAI directory from $FAI_CONFIG_SRC
 ### END SUBROUTINE INFO
@@ -30,7 +30,7 @@
 	die "Error: get-config-dir-$fai_config_method not found"
 fi
 
-ln -s $FAI $rundir/current_config
+ln -s $FAI /var/run/fai/current_config
 if [ ! -d $FAI/class ]; then
 	echo "WARNING: directory $FAI/class not found."
 fi