Changeset 3360 in MondoRescue

Timestamp:

Mar 7, 2015, 2:41:11 PM (9 years ago)

Author:

Bruno Cornec

Message:

Backports from 3.2 (rev 3336-3359):

• Improve kernel 3.14+ detection for initramfs
• Fix installation of parted2fdisk under rootfs by removing useless -s option of install
• Remove usage of internal function basename in parted2fdisk use File::Basename instead

Location:

branches/3.0/mindi

Files:

• install.sh (modified) (1 diff)
• mindi (modified) (5 diffs)
• parted2fdisk.pl (modified) (7 diffs)
• rootfs/sbin/find-and-mount-cdrom (modified) (1 diff)

branches/3.0/mindi/install.sh

@@ -112 +112 @@
 # Managing parted2fdisk
 if [ "$ARCH" = "ia64" ] ; then
-    (cd $SBINDIR && ln -sf parted2fdisk.pl parted2fdisk)
-    install -s -m 755 $SBINDIR/parted2fdisk.pl $locallib/mindi/rootfs/sbin/parted2fdisk
+    (cd $SBINDIR && ln -sf parted2fdisk.pl parted2fdisk && install -m 755 $SBINDIR/parted2fdisk.pl $locallib/mindi/rootfs/sbin/parted2fdisk
 else
     # FHS requires fdisk under /sbin

branches/3.0/mindi/mindi

@@ -733 +733 @@
     local lcMagicExt2fs="EXT2-fs: blocksize too small for device."
     local lcMagicExt3fs="<3>EXT3-fs: blocksize too small for journal device."
-    local lcMagicInitfs="<6>checking if image is initramfs...|[<]*6[>]*Unpacking initramfs...|<6>Trying to unpack rootfs image as initramfs"
+    local lcMagicInitfs="<6>checking if image is initramfs...|[<]*6[>]*Unpacking initramfs...|[<]*6[>]*Trying to unpack rootfs image as initramfs"
 
     # local variables
@@ -2554 +2554 @@
 
 TurnTgzIntoRdz() {
-    local tgz_dir_fname rdz_fname tempfile mountpoint old_pwd nodes kernelsize maxsize res currsize not_copied j k s w needed_modules_path
+    local tgz_dir_fname rdz_fname tempfile mountpoint old_pwd nodes kernelsize maxsize res currsize not_copied j k s w needed_modules_path d thelink
 
     tgz_dir_fname=$1
@@ -2591 +2591 @@
         fi
     done
+
     LogFile "INFO: what is now in $mountpoint"
     ls -alR $mountpoint >> $LOGFILE
     
     # Check files before copying to discover configuration issues or McAfee preventing mindi reading these files
+    # copy from rootfs into mountpoint
     for f in $tgz_dir_fname/*; do 
         if [ ! -r $f ]; then
@@ -2602 +2604 @@
         fi
     done
+    (cd etc ; ln -sf bashrc profile ; ln -sf bashrc shrc ; ln -sf ../proc/mounts mtab ; ln -sf ../sbin/init linuxrc)
+    ln -sf sbin/init linuxrc
     tar -zxf symlinks.tgz || Die "Cannot untar symlinks.tgz"
 
@@ -2619 +2623 @@
     
     # Copy of files mandatory for ssh to automate mount if sshfs is used
-    mkdir $mountpoint/.ssh
+    mkdir -p $mountpoint/.ssh $mountpoint/tmp
     cp -a ~root/.ssh/* $mountpoint/.ssh 2> /dev/null
     cat > $mountpoint/tmp/myssh << EOF

branches/3.0/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;
@@ -156 +159 @@
         "linux-swap" => "82",
         "lvm" => "8e",
+        "raid" => "fd",
         "" => "",
     );
@@ -435 +439 @@
         "linux-swap" => "Linux swap",
         "lvm" => "Linux LVM",
+        "raid" => "RAID Linux auto",
         "fat16" => "fat16",
         "fat32" => "fat32",
@@ -479 +484 @@
 
 # This will return MB
-get_parted ($device,$start,$end,\%type);
+get_parted($device,$start,$end,\%type);
 
 while (($n,$d) = each %type) {
@@ -675 +680 @@
 }
 
-
-# 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 {
 

branches/3.0/mindi/rootfs/sbin/find-and-mount-cdrom

@@ -1 +1 @@
 #!/bin/sh
-
+#
+# $Id$
+#
 
 TryToFindCDROM() {