[Fai-commit] r3754 - in people/mugwump/lvmraid: . bin

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

Author: samv-guest
Date: 2006-08-04 00:17:59 +0000 (Fri, 04 Aug 2006)
New Revision: 3754

Modified:
   people/mugwump/lvmraid/
   people/mugwump/lvmraid/bin/setup_harddisks
Log:
 r10508 at wilber:  samv | 2006-07-10 15:05:28 +1200
 Bugfixes from initial testing



Property changes on: people/mugwump/lvmraid
___________________________________________________________________
Name: svk:merge
   - d29f7b36-84ff-0310-85ce-ba787dbd31ca:/local/fai/people/mugwump/lvmraid:10507
   + d29f7b36-84ff-0310-85ce-ba787dbd31ca:/local/fai/people/mugwump/lvmraid:10508

Modified: people/mugwump/lvmraid/bin/setup_harddisks
===================================================================
--- people/mugwump/lvmraid/bin/setup_harddisks	2006-08-04 00:12:46 UTC (rev 3753)
+++ people/mugwump/lvmraid/bin/setup_harddisks	2006-08-04 00:17:59 UTC (rev 3754)
@@ -389,7 +389,7 @@
 my $sectorsize = 512;
 
 # used programs
-my $g_sfdisk_options = "-q $ENV{sfdisk}";     # be quiet
+my $g_sfdisk_options = join(" ",grep { defined } "-q", $ENV{sfdisk});     # be quiet
 my $g_mke2fs_options = "-q";     # be quiet
 my $g_mkreiserfs_options = "";
 my $g_mkxfs_options = "-f";
@@ -546,7 +546,6 @@
       $devdisklist = "$devdisklist /dev/$device";
     }
     print "Probing disks: $devdisklist\n";
-    print "Disks found:";
     $result = `sh -c "LC_ALL=C sfdisk -g -q $devdisklist"`;
     foreach my $line(split(/\n/,$result)){
 
@@ -891,6 +890,8 @@
 
 			my $p = \$disk_state->{primary};
 
+		    	$$p++;
+
 			# ??
 			# ($$p == 3) && ($disk =~ /^sd/) && ($$p++);
 
@@ -1246,7 +1247,7 @@
 
     # set FAT12 for really small DOS partitions
     foreach $mountpoint (split(/\s/, $g_DiskMountpoints{$disk})) {
-
+    	next if $mountpoint =~ m{^extended};
 	($g_MPOptions{$mountpoint} =~ /\bdosfat16\b/i)
 	    && (($g_MPSize{$mountpoint} * $g_DiskUnits{$disk}
 		 * $sectorsize) < 32 * $megabyte)
@@ -1815,6 +1816,7 @@
 
 sub FormatMountPoint{
     my $mountpoint = shift;
+    return if $mountpoint =~ m{^extended};
 
     my $device = $g_MountpointPart{$mountpoint};
     my ($mountpointname, $command, $result);
@@ -1947,7 +1949,7 @@
 
 	$command .= " /dev/$device";
 
-	mutter "running: $command\n";
+	mutter "running: $command";
 	if ($test != 1){
 	    $result = `$command`;
 	    barf "`$command' failed; output:\n$result" if $?;