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

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

Author: lange
Date: 2006-07-31 20:52:00 +0000 (Mon, 31 Jul 2006)
New Revision: 3705

Modified:
   trunk/bin/fai
   trunk/lib/subroutines
Log:
replace $fstab with fstab


Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2006-07-31 16:11:23 UTC (rev 3704)
+++ trunk/bin/fai	2006-07-31 20:52:00 UTC (rev 3705)
@@ -34,7 +34,6 @@
 rundir=/var/run/fai
 stamp=$rundir/FAI_INSTALLATION_IN_PROGRESS
 romountopt="-o async,noatime,nolock,ro,actimeo=1800"
-fstab=fstab  # Solaris uses vfstab
 
 # the type of operating system (linux, sunos)
 oclass=$(uname -s | tr a-z A-Z)

Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2006-07-31 16:11:23 UTC (rev 3704)
+++ trunk/lib/subroutines	2006-07-31 20:52:00 UTC (rev 3705)
@@ -402,13 +402,13 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 task_mountdisks() {
 
-    [ ! -f $LOGDIR/$fstab ] && die "No $LOGDIR/$fstab created."
+    [ ! -f $LOGDIR/fstab ] && die "No $LOGDIR/fstab created."
     # mount swap space
     local sd
     for sd in $SWAPLIST; do
 	swapon $sd && [ "$verbose" ] && echo "Enable swap device $sd"
     done
-    mount2dir $FAI_ROOT $LOGDIR/$fstab
+    mount2dir $FAI_ROOT $LOGDIR/fstab
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 task_configure() {