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

Timestamp:

Feb 13, 2015, 8:27:10 PM (9 years ago)

Author:

Bruno Cornec

Message:

• parted2fdisk now works also on x86 machines and just check fdisk version to replace it when too old to support GPT. Is now a full

replacement of fdisk usage in mondo

File:

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

branches/3.2/mindi/parted2fdisk.pl

@@ -4 +4 @@
 #
 # parted2fdisk: fdisk like interface for parted 
-# [developped for mindi/mondo http://www.mondorescue.org]
+# [developed for mindi/mondo http://www.mondorescue.org]
 #
 # Aims to be architecture independant (i386/ia64)
 # Tested on ia64 with RHAS 2.1 - Mandrake 9.0 - RHEL 3.0 - SLES 10
 #
-# Copyright B. Cornec 2000-2013
+# Copyright B. Cornec 2000-2015
 # Provided under the GPL v2
 
 use strict;
+use File::Basename;
 
 
@@ -19 +20 @@
 =head1 NAME
 
-parted2fdisk is a fdisk lie command using parted internally.
+parted2fdisk is a fdisk like command using parted internally.
 
 =head1 DESCRIPTION
 
-parted2fdisk behaves like a fdisk command, but dialog internally with parted in order to manipulate partiion tables, which allow it to support GPT partition format as well as MBR, contrary to fdisk. It aimed at providing compatible external interface wti fdisk. Developed initialy for ia64 Linux, but is also useful now on x86 systems using GPT partition format (for large HDDs).
+parted2fdisk behaves like the fdisk command, but dialog internally with parted in order to manipulate partition tables, which allow it to support GPT partition format as well as MBR, contrary to fdisk. It aims at providing compatible external interface with fdisk. Developed initialy for ia64 Linux, it is also useful now on x86 systems using GPT partition format (for large HDDs).
 
 =head1 SYNOPSIS
@@ -96 +97 @@
 
 my $fdisk = "/sbin/fdisk";
+$fdisk = "/usr/sbin/fdisk" if (not -x "/sbin/fdisk");
 my $parted = "/sbin/parted";
+$parted = "/usr/sbin/parted" if (not -x "/sbin/parted");
 
 my $i;
@@ -109 +112 @@
 my %end;
 my %type;
-my $arch;
 my $fake = 0;
 my $mega = 1048576;
@@ -116 +118 @@
 $| = 1;
 
-# Determine on which arch we're running
-if (defined ($ENV{ARCH})) {
-    $arch = $ENV{ARCH};
-} else {
-    $arch = `uname -m`;
-    chomp($arch);
-}
-
 #
 # Looking for fdisk
@@ -129 +123 @@
 $fdisk = is_lsb($fdisk);
 #
-# We always use fdisk except on ia64 with GPT types of 
+# We always use fdisk except with GPT types of 
 # partition tables where we need parted
 # All should return fdisk like format so that callers
@@ -156 +150 @@
         "linux-swap" => "82",
         "lvm" => "8e",
+        "raid" => "fd",
         "" => "",
     );
@@ -197 +192 @@
 print FLOG "Called with device $device and arg $args\n";
 
-if ($arch =~ /^ia64/) {
+# util-linux/fdisk version
+open(CMD,"$fdisk -v |") || die "Unable to execute $fdisk";
+my $version = <CMD>;
+close(CMD);
+chomp($version);
+$version =~ s/[^0-9\.]*([0-9\.]+)[\)]$/$1/;
+my ($v,$maj,$min) = split(/\./,$version);
+
+if (($v == 1) || (($v == 2) && ($maj < 22))) {
     # Check partition table type
-    print FLOG "We're on ia64 ...\n";
+    print FLOG "We use an old fdisk, activating replacement code...\n";
     $parted = is_lsb($parted);
     $type = which_type($device);
@@ -435 +438 @@
         "linux-swap" => "Linux swap",
         "lvm" => "Linux LVM",
+        "raid" => "RAID Linux auto",
         "fat16" => "fat16",
         "fat32" => "fat32",
@@ -601 +605 @@
 print FLOG "$d";
 close(PARTED);
+chomp($d);
+# parted version
+$d =~ s/[^0-9\.]*([0-9\.]+)$/$1/;
+my ($v,$maj,$min) = split(/\./,$d);
+# depending on parted version, information given change:
+if ($v == 2) {
+    # RHEL 6 parted 2.1
+    $mode=2;
+} elsif ($v == 1) {
+    if (($maj <= 5) || (($maj == 6) && (defined $min) && ($min < 25))) {
+        # RHEL 3 parted 1.6.3
+        # RHEL 4 parted 1.6.19
+        $mode=0;
+    } else {
+        # SLES 10 parted >= 1.6.25
+        $mode=1;
+    }
+} else {
+    $mode=-1;
+}
+print FLOG "mode: $mode\n";
 
 open (PARTED, "$parted -s $device print |") || die "Unable to read from $parted";
@@ -608 +633 @@
 $d = <PARTED>;
 
-# depending on parted version, information given change:
-if ($d =~ /\bSize\b/) {
-    # SLES 10 parted >= 1.6.25
-    $mode=1;
-} else {
-    # RHEL 3 parted 1.6.3
-    # RHEL 4 parted 1.6.19
-    $mode=0;
-}
-print FLOG "mode: $mode\n";
+if ($mode == 2) {
+    $d = <PARTED>;
+    $d = <PARTED>;
+    $d = <PARTED>;
+}
 print FLOG "Got from parted: \n";
 print FLOG "Minor    Start       End     Filesystem\n";
@@ -623 +643 @@
 while (($n,$d) = split(/\s/, <PARTED>,2)) {
     chomp($d);
+    # v2 of parted ends with empty line
+    next if (($mode == 2) && ($n eq "") && ($d eq ""));
+    # v2 of parted starts with space potentially
+    ($n,$d) = split(/\s/, $d,2) if (($mode == 2) && ($n eq ""));
     next if ($n !~ /^[1-9]/);
     $d =~ s/^\s*//;
@@ -630 +654 @@
         $unit = 1;
     } elsif ($mode == 1) {
+        ($$start{$n},$$end{$n},$size,$$type{$n},$void) = split(/ /,$d);
+        $unit = $mega;
+    } elsif ($mode == 2) {
         ($$start{$n},$$end{$n},$size,$$type{$n},$void) = split(/ /,$d);
         $unit = $mega;
@@ -675 +702 @@
 }
 
-
-# Based on Version 2.4  27-Sep-1996  Charles Bailey  bailey@genetics.upenn.edu
-# in Basename.pm
-
-sub basename {
-
-my($fullname) = shift;
-
-my($dirpath,$basename);
-
-($dirpath,$basename) = ($fullname =~ m#^(.*/)?(.*)#s);
-
-return($basename);
-}
-
 sub myexit {