[Fai-commit] r3592 - people/michael/features/setup_harddisks_2/implementation

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

Author: michael-guest
Date: 2006-07-22 00:02:51 +0000 (Sat, 22 Jul 2006)
New Revision: 3592

Modified:
   people/michael/features/setup_harddisks_2/implementation/shdd2-sizes
Log:
bugfixes


Modified: people/michael/features/setup_harddisks_2/implementation/shdd2-sizes
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/shdd2-sizes	2006-07-22 00:01:09 UTC (rev 3591)
+++ people/michael/features/setup_harddisks_2/implementation/shdd2-sizes	2006-07-22 00:02:51 UTC (rev 3592)
@@ -8,7 +8,12 @@
 
 foreach my $disk ( @FAI::disks )
 {
-  my @parted_print = split( "\n", `/sbin/parted -s /dev/hda unit TB print` );
+  if( ! ( $disk =~ m{^/} ) )
+  {
+    $disk = "/dev/" . $disk;
+  }
+  
+  my @parted_print = split( "\n", `/sbin/parted -s $disk unit TB print` );
   my $parted_fs_start = 0;
   my $parted_fs_end = 0;
 
@@ -50,13 +55,10 @@
       my $fs = $1;
       print $id . ": " . $fs . "\n";
     }
-
-
-    
   }
 
 
-  @parted_print = split( "\n", `/sbin/parted -s /dev/hda unit B print` );
+  @parted_print = split( "\n", `/sbin/parted -s $disk unit B print` );
   {
     foreach my $line ( @parted_print )
     {
@@ -69,7 +71,7 @@
 
 
 
-  @parted_print = split( "\n", `/sbin/parted -s /dev/hda unit B print` );
+  @parted_print = split( "\n", `/sbin/parted -s $disk unit chs print` );
   {
     foreach my $line ( @parted_print )
     {