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

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

Author: lange
Date: 2006-09-08 10:26:01 +0000 (Fri, 08 Sep 2006)
New Revision: 3897

Modified:
   trunk/bin/fai
   trunk/bin/setup_harddisks
   trunk/lib/subroutines-linux
Log:
remove varaible diskvar, use $LOGDIR/disk_var.sh instead


Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2006-09-08 10:03:16 UTC (rev 3896)
+++ trunk/bin/fai	2006-09-08 10:26:01 UTC (rev 3897)
@@ -80,9 +80,6 @@
     [ "$FAI_ROOT" = '/' ] && ROOTCMD=
     target=$FAI_ROOT
 
-    # several log files
-    diskvar=$LOGDIR/disk_var.sh
-
     if [ $do_init_tasks -eq 1 ]; then
         trap 'echo "Now rebooting";faireboot' INT QUIT ;
     else

Modified: trunk/bin/setup_harddisks
===================================================================
--- trunk/bin/setup_harddisks	2006-09-08 10:03:16 UTC (rev 3896)
+++ trunk/bin/setup_harddisks	2006-09-08 10:26:01 UTC (rev 3897)
@@ -152,7 +152,7 @@
 # Variables
 #****************************************************
 
-my $Version = "version 0.39fai";
+my $Version = "version 0.40fai";
 
 my $megabyte = 1024 * 1024;    # guess
 # $gigabyte = 1024 * $megabyte;
@@ -173,7 +173,7 @@
 # FAI output variables
 my $BootPartition = "";    # the boot partition like "hda1"
 my $BOOT_DEVICE = "";      # the root device like "hda" or "sdb"
-my $FAIOutputFile = $ENV{diskvar}; # write output variables to this file
+my $FAIOutputFile = "$ENV{LOGDIR}/disk_var.sh"; # write output variables to this file
 
 # old partition tables
 my %DiskUnits = ();        # unit size of each disk in sectors

Modified: trunk/lib/subroutines-linux
===================================================================
--- trunk/lib/subroutines-linux	2006-09-08 10:03:16 UTC (rev 3896)
+++ trunk/lib/subroutines-linux	2006-09-08 10:26:01 UTC (rev 3897)
@@ -92,22 +92,22 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ### BEGIN SUBROUTINE INFO
 # Provides-Var:    $BOOT_DEVICE $ROOT_PARTITION $BOOT_PARTITION $SWAPLIST
-# Requires-Var:    $LOGDIR $diskvar
+# Requires-Var:    $LOGDIR $LOGDIR/disk_var.sh
 # Short-Description: partition local hard disk
 ### END SUBROUTINE INFO
 
 task_partition() {
 
     echo "Partitioning local harddisks"
-    [ ! -s $diskvar ] && setup_harddisks -d -X | tee $LOGDIR/format.log 2>&1
-    # setup_harddisks must create $diskvar file
-    if [ ! -s $diskvar ]; then
+    [ ! -s $LOGDIR/disk_var.sh ] && setup_harddisks -d -X | tee $LOGDIR/format.log 2>&1
+    # setup_harddisks must create $LOGDIR/disk_var.sh file
+    if [ ! -s $LOGDIR/disk_var.sh ]; then
 	cat $LOGDIR/format.log
 	sndmon "TASKERROR partition 21"
-	die "setup_harddisks did not create $diskvar file."
+	die "setup_harddisks did not create $LOGDIR/disk_var.sh file."
     fi
     # now define variable for root and boot partition and boot device
-    . $diskvar
+    . $LOGDIR/disk_var.sh
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ### BEGIN SUBROUTINE INFO