Changeset 1801 in MondoRescue for branches

Timestamp:

Nov 15, 2007, 3:32:23 PM (18 years ago)

Author:

Bruno Cornec

Message:

on ia64 now use the perl script parted2fdisk at retore time also

Location:

branches/2.2.5/mindi

Files:

• install.sh (modified) (2 diffs)
• parted2fdisk.pl (modified) (9 diffs)

branches/2.2.5/mindi/install.sh

@@ -95 +95 @@
 if [ "$ARCH" = "ia64" ] ; then
     (cd $local/sbin && ln -sf parted2fdisk.pl parted2fdisk)
-    make -f Makefile.parted2fdisk DEST=$locallib/mindi install
-    if [ -f $locallib/mindi/rootfs/sbin/parted2fdisk-$ARCH ]; then
-        echo "Installing parted2fdisk ..."
-        install -s -m 755 $locallib/mindi/rootfs/sbin/parted2fdisk-$ARCH $locallib/mindi/rootfs/sbin/parted2fdisk
-        install -s -m 755 $locallib/mindi/rootfs/sbin/parted2fdisk-$ARCH $local/sbin/parted2fdisk
-    else
-        echo "WARNING: no parted2fdisk found, mindi will not work on this arch ($ARCH)"
-    fi
+    install -s -m 755 $local/sbin/parted2fdisk.pl $locallib/mindi/rootfs/sbin/parted2fdisk
 else
     # FHS requires fdisk under /sbin
@@ -109 +102 @@
     ( cd $locallib/mindi/rootfs/sbin && ln -sf fdisk parted2fdisk)
 fi
-# Remove left parted2fdisk
-rm -f $locallib/mindi/rootfs/sbin/parted2fdisk-*
 
 if [ "$PKGBUILDMINDI" != "true" ]; then

branches/2.2.5/mindi/parted2fdisk.pl

@@ -38 +38 @@
 my $arch;
 my $fake = 0;
+my $mega = 1048576;
 
 # Determine on which arch we're running
@@ -165 +166 @@
                         if (defined $start{$part-1}) {
                             # in MB => cyl
-                            $cylstart = sprintf("%d",$end{$part-1}*1048576/$un + 1);
+                            $cylstart = sprintf("%d",$end{$part-1}*$mega/$un + 1);
                             print FLOG "no start cyl given for creation... assuming the following $cylstart\n";
                         } else {
@@ -179 +180 @@
                         $start = 0.01;
                     } else {
-                        $start = $cylstart* $un / 1048576 +0.001;
+                        $start = $cylstart* $un / $mega + 0.001;
                     }
                     # this is a size in B/KB/MB/GB
@@ -205 +206 @@
                     print FLOG "end cyl : $cylend\n";
                     # parted needs MB
-                    $end = $cylend * $un / 1048576;
+                    $end = $cylend * $un / $mega;
                     print FLOG "n $l $part $cylstart $cylend => mkpart primary $start $end\n";
                     system "$parted -s $device mkpart primary ext2 $start $end\n" if ($fake == 0);
@@ -388 +389 @@
     # start and end are in cylinder in fdisk format
     # so return in MB * 1MB / what represents 1 cyl in B
-    $mstart = sprintf("%d",$$start{$n}*1048576/$un);
+    $mstart = sprintf("%d",$$start{$n}*$mega/$un);
     $mstart = 1 if ($mstart < 1);
     $mstart = $endmax if ($mstart > $endmax);
-    $mend = sprintf("%d",$$end{$n}*1048576/$un - 1);
+    $mend = sprintf("%d",$$end{$n}*$mega/$un - 1);
     $mend = $endmax if ($mend > $endmax);
     $mend = 1 if ($mend < 1);
@@ -497 +498 @@
 my $mode;
 my $size;
+my $unit;
 
 open (PARTED, "$parted -v |") || die "Unable to read from $parted";
@@ -514 +516 @@
     $mode=1;
 } else {
-    # RHEL 3 parted <= 1.6.3
+    # RHEL 3 parted 1.6.3
+    # RHEL 4 parted 1.6.19
     $mode=0;
 }
@@ -528 +531 @@
     if ($mode == 0) {
         ($$start{$n},$$end{$n},$$type{$n},$void) = split(/ /,$d);
+        $unit = 1;
     } elsif ($mode == 1) {
         ($$start{$n},$$end{$n},$size,$$type{$n},$void) = split(/ /,$d);
+        $unit = $mega;
     } else {
         die "Undefined mode $mode";
@@ -537 +542 @@
     $$type{$n} = "" if (not defined $$type{$n});
     # Handles potential suffixes in latest parted version. Return MB
-    $ret = decode_Bsuf($$start{$n},1048576);
+    $ret = decode_Bsuf($$start{$n},$unit);
     $$start{$n} = $ret;
-    $ret = decode_Bsuf($$end{$n},1048576);
+    $ret = decode_Bsuf($$end{$n},$unit);
     $$end{$n} = $ret;
     print FLOG "$n      $$start{$n}      $$end{$n}     $$type{$n}\n";