[Fai-commit] r6240 - trunk/bin

[Michael Tautschnig]

Author: mt
Date: 2010-12-17 14:12:48 +0000 (Fri, 17 Dec 2010)
New Revision: 6240

Modified:
   trunk/bin/setup-storage
Log:
setup-storage: Generate conditional definitions for disk_var.sh such that
variables will only be set if not previously defined by users.


Modified: trunk/bin/setup-storage
===================================================================
--- trunk/bin/setup-storage	2010-12-17 09:42:59 UTC (rev 6239)
+++ trunk/bin/setup-storage	2010-12-17 14:12:48 UTC (rev 6240)
@@ -218,14 +218,14 @@
 
 # write variables to $LOGDIR/disk_var.sh
 # debugging
-$FAI::debug and print "$_=$FAI::disk_var{$_}\n"
+$FAI::debug and print "$_=\${$_:-$FAI::disk_var{$_}}\n"
   foreach (keys %FAI::disk_var);
 
 if ($FAI::no_dry_run)
 {
   open(DISK_VAR, ">$ENV{LOGDIR}/disk_var.sh")
     or die "Unable to write to file $ENV{LOGDIR}/disk_var.sh\n";
-  print DISK_VAR "$_=$FAI::disk_var{$_}\n" foreach (keys %FAI::disk_var);
+  print DISK_VAR "$_=\${$_:-$FAI::disk_var{$_}}\n" foreach (keys %FAI::disk_var);
   close DISK_VAR;
 }