Changeset 3663 in MondoRescue

Timestamp:

May 3, 2017, 11:27:14 AM (8 years ago)

Author:

Bruno Cornec

Message:

Better handling of -s option for parted2fdisk

File:

• branches/3.3/mindi/mr-parted2fdisk (modified) (3 diffs)

branches/3.3/mindi/mr-parted2fdisk

@@ -173 +173 @@
 # whatever the option used.
 $device = $ARGV[0] if (defined $opts{'l'});
-$device = $opts{'s'} if (defined $opts{'s'});
 $device = $ARGV[0] if (defined $ARGV[0]);
-$device = "" if ((not defined $device) || ($device =~ /^-/));
 
 # -s takes a partition as arg
 # so create a correct device from that
 if (defined $opts{'s'}) {
+    $device = $opts{'s'};
     $wpart = $device;
     # To support dev like cciss/c0d0p1
@@ -194 +193 @@
 }
 
-pb_log(1,"Called with device: $device\n");
+# util-linux/fdisk version
+my $fdisk = pb_check_req("fdisk",0);
+open(CMD,"$fdisk -v |") || die "Unable to execute $fdisk";
+my $version = <CMD>;
+close(CMD);
+chomp($version);
+# RHEL 5 has fdisk from util-linux 2.13-pre7
+# Mageia 4 has fdisk from util-linux 2.24.2
+$version =~ s/[^0-9\.]*([0-9a-z\.-]+)[\)]*$/$1/;
+my ($v,$maj,$min) = split(/\./,$version);
+
+# Consider pre version the same as the following for formats
+if ((defined $maj) && ($maj =~ /-pre/)) {
+    $maj =~ s/-pre.*$//;
+    $maj++;
+}
+# Remove potential remaining letters
+$maj =~ s/[a-z]+//;
+
+if ((defined $min) && ($min =~ /-pre/)) {
+    $min =~ s/-pre.*$//;
+    $min++;
+}
+$min =~ s/[a-z]+// if (defined $min);
 
 my %pid = ( "FAT" => "6",
@@ -217 +239 @@
     $pnum{$l} = $i;
 }
-
-# util-linux/fdisk version
-my $fdisk = pb_check_req("fdisk",0);
-open(CMD,"$fdisk -v |") || die "Unable to execute $fdisk";
-my $version = <CMD>;
-close(CMD);
-chomp($version);
-# RHEL 5 has fdisk from util-linux 2.13-pre7
-# Mageia 4 has fdisk from util-linux 2.24.2
-$version =~ s/[^0-9\.]*([0-9a-z\.-]+)[\)]*$/$1/;
-my ($v,$maj,$min) = split(/\./,$version);
-
-# Consider pre version the same as the following for formats
-if ((defined $maj) && ($maj =~ /-pre/)) {
-    $maj =~ s/-pre.*$//;
-    $maj++;
-}
-# Remove potential remaining letters
-$maj =~ s/[a-z]+//;
-
-if ((defined $min) && ($min =~ /-pre/)) {
-    $min =~ s/-pre.*$//;
-    $min++;
-}
-$min =~ s/[a-z]+// if (defined $min);
 
 # fdisk has a bug when handling more than 1024 disks, seen on RHEL