Changeset 3360 in MondoRescue for branches/3.0/mindi/mindi

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

File:

• branches/3.0/mindi/mindi (modified) (5 diffs)

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