[Fai-commit] r4839 - people/michael/features/setup_harddisks_2/implementation/lib

[mt at alioth.debian.org]

Author: mt
Date: 2008-01-25 17:18:48 +0000 (Fri, 25 Jan 2008)
New Revision: 4839

Modified:
   people/michael/features/setup_harddisks_2/implementation/lib/sizes.pm
   people/michael/features/setup_harddisks_2/implementation/lib/volumes.pm
Log:
- added debug output to make_range
- removed the udevsettle call, it's not necessary


Modified: people/michael/features/setup_harddisks_2/implementation/lib/sizes.pm
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/lib/sizes.pm	2008-01-25 08:43:26 UTC (rev 4838)
+++ people/michael/features/setup_harddisks_2/implementation/lib/sizes.pm	2008-01-25 17:18:48 UTC (rev 4839)
@@ -50,6 +50,7 @@
   use POSIX qw(ceil floor);
 
   my ($rstr, $size) = @_;
+  $FAI::debug and print "make_range called with $rstr, $size\n";
   # convert size to Bytes
   my $size_b = &FAI::convert_unit($size);
   # check the format of the string

Modified: people/michael/features/setup_harddisks_2/implementation/lib/volumes.pm
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/lib/volumes.pm	2008-01-25 08:43:26 UTC (rev 4838)
+++ people/michael/features/setup_harddisks_2/implementation/lib/volumes.pm	2008-01-25 17:18:48 UTC (rev 4839)
@@ -74,13 +74,11 @@
 
         # write the disk label as configured
         $error = &FAI::execute_command("parted -s $disk mklabel msdos");
-        &FAI::execute_command("udevsettle --timeout=10");
       } else {
 
         # write the disk label as configured
         $error = &FAI::execute_command("parted -s $disk mklabel " 
           . $FAI::configs{"PHY_$disk"}{disklabel});
-        &FAI::execute_command("udevsettle --timeout=10");
       }
       # retry partition-table print
       $error =