Changeset 3355 in MondoRescue for branches/3.2/mindi/parted2fdisk.pl

Timestamp:

Mar 5, 2015, 1:25:41 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Fix parted2fdisk for RHEL5 support with regex for fdisk version adapted
• parted2fdisk now supports being called with -l option without device. It then calls fdisk directly for this case to be fully compatible.

File:

• branches/3.2/mindi/parted2fdisk.pl (modified) (10 diffs)

branches/3.2/mindi/parted2fdisk.pl

@@ -7 +7 @@
 #
 # Aims to be architecture independant (i386/ia64)
-# Tested on ia64 with RHAS 2.1 - Mandrake 9.0 - RHEL 3.0 - SLES 10
+# Tested on ia64 with RHAS 2.1 - Mandrake 9.0 - RHEL 3.0 - SLES 10 - RHEL 5 - 
 #
 # Copyright B. Cornec 2000-2015
@@ -29 +29 @@
 
 parted2fdisk -s partition
-parted2fdisk -l device
+parted2fdisk -l [device]
 parted2fdisk [-n] device
 
@@ -46 +46 @@
 =item B<-l>
 
-List the partition tables for the specified device and then exit.
+List the partition tables for the specified device (or all if none specified) and then exit.
 
 =item B<no option>
@@ -175 +175 @@
 }
 
-if (($args ne "") and ($device eq "")) {
+if (($args ne "") && ($args ne "-l") && ($device eq "")) {
     mysyn();
 }
@@ -191 +191 @@
 
 print FLOG "Called with device $device and arg $args\n";
+
+if (($args =~ /-l/) && ($device eq "")) {
+    # Pass to real fdisk directly
+    local_fdisk($args,$device);
+    myexit(0);
+}
 
 # util-linux/fdisk version
@@ -197 +203 @@
 close(CMD);
 chomp($version);
-$version =~ s/[^0-9\.]*([0-9\.]+)[\)]*$/$1/;
+# RHEL 5 has fdisk (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++;
+}
+if ((defined $min) && ($min =~ /-pre/)) {
+    $min =~ s/-pre.*$//;
+    $min++;
+}
 
 if (($v == 1) || (($v == 2) && ($maj < 22))) {
@@ -370 +388 @@
 #
 # Print only mode
+local_fdisk($args,$device);
+myexit(0);
+
+sub local_fdisk {
+
+my $args=shift;
+my $device=shift;
+
 print FLOG "Passing everything to the real fdisk with $args $device\n";
 
@@ -388 +414 @@
     close(STDIN);
 }
-myexit(0);
-
+return;
+}
 
 # Is your system LSB ?
@@ -415 +441 @@
 return($cmd);
 }
+
+# Unused for now - Kept for reference in case there is a need later on
+sub fdisk_list_all {
+my $device = shift;
+my $wpart = shift;
+my $start = shift;
+my $end = shift;
+my $verbose = shift;
+
+return fdisk_list($device,$wpart,$start,$end,$verbose) if ((defined $device) && ($device ne ""));
+
+# If no device given loop on the list of devices found in /proc/partitions
+open(PART,"/proc/partitions") || die "Unable to open /proc/partitions";
+while (<PART>) {
+    my ($maj,$min,$blocks,$dev) = split(/\s+/);
+    next if ($dev =~ /^fd|^sr/);
+    next if ($min != 0);
+    fdisk_list("/dev/$dev",$wpart,$start,$end,$verbose);
+}
+close(PART);
+}
+
 
 sub fdisk_list {
@@ -482 +530 @@
 
 # This will return MB
-get_parted ($device,$start,$end,\%type);
+get_parted($device,$start,$end,\%type);
 
 while (($n,$d) = each %type) {