[Fai-commit] r6443 - branches/stable/3.4/lib/setup-storage

[Michael Prokop]

Author: mika
Date: 2011-04-15 18:14:20 +0000 (Fri, 15 Apr 2011)
New Revision: 6443

Modified:
   branches/stable/3.4/lib/setup-storage/Commands.pm
   branches/stable/3.4/lib/setup-storage/Exec.pm
   branches/stable/3.4/lib/setup-storage/Volumes.pm
Log:
setup-storage: Revert incomplete $FAI::DATADIR use to $ENV{LOGDIR}

(cherry picked from commit 509b4f1ea1ba916917268ccacdbc485b7afcbdac)

Modified: branches/stable/3.4/lib/setup-storage/Commands.pm
===================================================================
--- branches/stable/3.4/lib/setup-storage/Commands.pm	2011-04-15 18:14:04 UTC (rev 6442)
+++ branches/stable/3.4/lib/setup-storage/Commands.pm	2011-04-15 18:14:20 UTC (rev 6443)
@@ -276,7 +276,7 @@
 sub build_raid_commands {
 
   # check RAID arrays if there are pre-existing ones
-  &FAI::push_command("mdadm --assemble --scan --config=$FAI::DATADIR/mdadm-from-examine.conf",
+  &FAI::push_command("mdadm --assemble --scan --config=$ENV{LOGDIR}/mdadm-from-examine.conf",
     "", "mdadm_startall_examined") if (scalar(keys %FAI::current_raid_config));
   foreach my $id (keys %FAI::current_raid_config) {
     my $md = "/dev/md$id";

Modified: branches/stable/3.4/lib/setup-storage/Exec.pm
===================================================================
--- branches/stable/3.4/lib/setup-storage/Exec.pm	2011-04-15 18:14:04 UTC (rev 6442)
+++ branches/stable/3.4/lib/setup-storage/Exec.pm	2011-04-15 18:14:20 UTC (rev 6443)
@@ -181,7 +181,7 @@
     message      => "mdadm tried to assemble arrays but failed, ignoring as arrays might be running already\n",
     stderr_regex => '^$',
     stdout_regex => '^$',
-    program      => "mdadm --assemble --scan --config=$FAI::DATADIR/mdadm-from-examine.conf",
+    program      => "mdadm --assemble --scan --config=$ENV{LOGDIR}/mdadm-from-examine.conf",
     response     => "warn",
     exit_codes   => [2],
   },

Modified: branches/stable/3.4/lib/setup-storage/Volumes.pm
===================================================================
--- branches/stable/3.4/lib/setup-storage/Volumes.pm	2011-04-15 18:14:04 UTC (rev 6442)
+++ branches/stable/3.4/lib/setup-storage/Volumes.pm	2011-04-15 18:14:20 UTC (rev 6443)
@@ -458,7 +458,7 @@
 #    devices=/dev/sde3,/dev/sdf3,/dev/sdd3
 
   # create a temporary mdadm-from-examine.conf
-  open(MDADM_EX, ">$FAI::DATADIR/mdadm-from-examine.conf");
+  open(MDADM_EX, ">$ENV{LOGDIR}/mdadm-from-examine.conf");
 
   # the id of the RAID
   my $id;