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

[mt at alioth.debian.org]

Author: mt
Date: 2008-01-25 08:43:26 +0000 (Fri, 25 Jan 2008)
New Revision: 4838

Modified:
   people/michael/features/setup_harddisks_2/implementation/lib/volumes.pm
Log:
let the system take a deep breath before checking the partition table once
again; and even more so, check the error code.


Modified: people/michael/features/setup_harddisks_2/implementation/lib/volumes.pm
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/lib/volumes.pm	2008-01-16 11:26:40 UTC (rev 4837)
+++ people/michael/features/setup_harddisks_2/implementation/lib/volumes.pm	2008-01-25 08:43:26 UTC (rev 4838)
@@ -74,16 +74,20 @@
 
         # 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 =
         &FAI::execute_ro_command("parted -s $disk unit TiB print", \@parted_print, 0);
     }
+        
+    ($error eq "") or die "Failed to read the partition table from $disk\n";
 
 # the following code parses the output of parted print, using various units
 # (TiB, B, chs)