| 1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.0/root/sbin/e-smith/add_drive_to_raid mezzanine_patched_e-smith-base-4.18.0/root/sbin/e-smith/add_drive_to_raid |
| 2 |
|
|
--- e-smith-base-4.18.0/root/sbin/e-smith/add_drive_to_raid 2007-05-31 11:04:43.000000000 -0600 |
| 3 |
|
|
+++ mezzanine_patched_e-smith-base-4.18.0/root/sbin/e-smith/add_drive_to_raid 2007-05-31 11:04:26.000000000 -0600 |
| 4 |
|
|
@@ -39,23 +39,23 @@ |
| 5 |
|
|
my %devices = $raid->get_raid_details(); |
| 6 |
|
|
my @devices = sort { $devices{$a}{DeviceSize} <=> $devices{$b}{DeviceSize} } keys %devices; |
| 7 |
|
|
|
| 8 |
|
|
-die "System doesn't contain any raid devices" unless $#devices >= 0; |
| 9 |
|
|
+die "There are no RAID devices configured\n" unless $#devices >= 0; |
| 10 |
|
|
|
| 11 |
|
|
my %partitions = $raid->get_partitions(); |
| 12 |
|
|
|
| 13 |
|
|
my $minsize = 0; |
| 14 |
|
|
|
| 15 |
|
|
-die "/dev/$newdev is not a block special device" unless -b "/dev/$newdev"; |
| 16 |
|
|
+die "/dev/$newdev is not a block special device\n" unless -b "/dev/$newdev"; |
| 17 |
|
|
|
| 18 |
|
|
for my $dev (@devices) |
| 19 |
|
|
{ |
| 20 |
|
|
- die "/dev/$newdev is already in use" if grep m#^$newdev$#, @{$devices{$dev}{UsedDisks}}; |
| 21 |
|
|
+ die "/dev/$newdev is already in use\n" if grep m#^$newdev$#, @{$devices{$dev}{UsedDisks}}; |
| 22 |
|
|
$minsize += $devices{$dev}{DeviceSize} + 65; |
| 23 |
|
|
} |
| 24 |
|
|
|
| 25 |
|
|
-die "/dev/$newdev is not large enough" unless $partitions{$newdev}{blocks} >= $minsize; |
| 26 |
|
|
+die "/dev/$newdev is not large enough\n" unless $partitions{$newdev}{blocks} >= $minsize; |
| 27 |
|
|
|
| 28 |
|
|
-die "/dev/$newdev already contains partitions" unless $force or ! grep m#^$newdev.+$#, keys %partitions; |
| 29 |
|
|
+die "/dev/$newdev already contains partitions\n" unless $force or ! grep m#^$newdev.+$#, keys %partitions; |
| 30 |
|
|
|
| 31 |
|
|
my $pid = open(STDERR, "|-"); |
| 32 |
|
|
die gettext("Can't fork"), ": $!\n" unless defined $pid; |
Parent Directory
| 
Revision Log
| 
Revision Graph
