Changeset 1837 in MondoRescue

Timestamp:

Dec 13, 2007, 7:34:46 PM (17 years ago)

Author:

Bruno Cornec

Message:

Fix an issue on parted output (K instead of KB) in parted2fdisk at restore time

Location:

branches/2.2.5/mindi

Files:

• parted2fdisk.pl (modified) (1 diff)
• rootfs/sbin/init (modified) (1 diff)

branches/2.2.5/mindi/parted2fdisk.pl

@@ -558 +558 @@
 
 #print FLOG "decode_Bsuf input: $size / $unit ";
-if ($size =~ /KB$/i) {
-    $size =~ s/KB$//i;
+if ($size =~ /K[B]*$/i) {
+    $size =~ s/K[B]*$//i;
     $size *= 1024;
-} elsif ($size =~ /MB$/i) {
-    $size =~ s/MB$//i;
+} elsif ($size =~ /M[B]*$/i) {
+    $size =~ s/M[B]*$//i;
     $size *= 1048576;
-} elsif ($size =~ /GB$/i) {
-    $size =~ s/GB$//i;
+} elsif ($size =~ /G[B]*$/i) {
+    $size =~ s/G[B]*$//i;
     $size *= 1073741824;
-} elsif ($size =~ /TB$/i) {
-    $size =~ s/TB$//i;
+} elsif ($size =~ /T[B]*$/i) {
+    $size =~ s/T[B]*$//i;
     $size *= 1099511627776;
 } else {

branches/2.2.5/mindi/rootfs/sbin/init

@@ -742 +742 @@
 
 # Log some useful info
-LogIt "init (from mindi v$MINDI_VER-r${MINDI_REV}"
+LogIt "init (from mindi v$MINDI_VER-r${MINDI_REV})"
 LogIt "/proc/cmdline is:"
 cat /proc/cmdline  >> $LOGFILE