Changeset 3336 in MondoRescue

Timestamp:

Jan 26, 2015, 10:30:36 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Backport from 3.2 remaining additoinal support for recent Fedora, btrfs, ...)

Location:

branches/3.0/mindi

Files:

• analyze-my-lvm (modified) (1 diff)
• mindi (modified) (7 diffs)
• parted2fdisk.pl (modified) (1 diff)

branches/3.0/mindi/analyze-my-lvm

@@ -75 +75 @@
     fi
 
-    echo "# $LVMCMD lvcreate$params -n $logical_volume $volume_group"
+    echo "# echo y | $LVMCMD lvcreate$params -n $logical_volume $volume_group"
 }
 

branches/3.0/mindi/mindi

@@ -576 +576 @@
 #       LogFile "INFO: '$incoming' generates filelist '$filelist'"
         for fname in $filelist ; do
-            [ "$fname" != "" ] && echo "$fname" >> $tempfile
+            [ "$fname" != "" ] && echo "$fname" >> $tempfile
         done
         progress=$(($progress+1))
@@ -895 +895 @@
                 LogFile "          This warning only affects you if you are using LVM."
                 if echo "$MODULES" | grep lvm &> /dev/null ; then
-                    LogFile "          I think you are, so please take heed!"
+                    LogFile "          I think you are, so please take heed!"
                 else
-                    LogFile "          I don't think you are, so don't worry about it."
+                    LogFile "          I don't think you are, so don't worry about it."
                 fi
             fi
@@ -1437 +1437 @@
             label="$uuid"
         fi
+
+        # On RHEL 7 they use UUID concretely, even when not mentioned in fstab
+        # in order to mount the root part e.g. in grub.
+        # One way to solve this is to add the UUID now, if there wasn't one so it's
+        # restored correctly
+        if [ _"$label" = _"" ]; then
+            label=`blkid $current_partition | perl -p -e 's/.* UUID="([A-z0-9-]+)" .*/$1/'`
+        fi
+
         partition_format="`echo "$partition_format" | cut -d',' -f1`"; # in case user has ext3,ext2 or something dumb like that
         [ "$partition_format" = "auto" ] && partition_format="`mount | grep -w $current_partition | $AWK '{print$5;}'`"; # in case user uses 'auto' (dumb!)
@@ -2176 +2185 @@
         Die "You have $res files present in dependency list\nbut absent from filesystem."
     fi
-    FindAndAddUserKeyboardMappingFile
     mkdir -p $bigdir/tmp
     if [ _"$MONDO_SHARE" != _"" ]; then
@@ -2182 +2190 @@
         cp -f $MINDI_TMP/mondo-restore.cfg $bigdir/tmp &> /dev/null
     fi
+
+    # Needs to be done after the MRCFG creation
+    FindAndAddUserKeyboardMappingFile
+
     [ -d "/mnt/.boot.d" ] && echo "GENTOO" > $bigdir/tmp/DUMBASS-GENTOO
     DropOptimizedLibraries $needlist $bigdir
@@ -2564 +2576 @@
     cd "$mountpoint"
 
+    # Check whether /lib64 or /lib or /sbin or /bin is a link and if so explicitly create one in rootfs (Fedora 17 crazyness)
+    for d in bin sbin lib lib64; do
+        if [ -h "/$d" ]; then
+            thelink=`readlink /$d`
+            mkdir -p $mountpoint/$thelink || LogIt "ERROR: Unable to create $thelink in $mountpoint."
+            mv $mountpoint/$d/* $mountpoint/$d/.??* $mountpoint/$thelink 2> /dev/null
+            if [ -d "$mountpoint/$d" -a ! -h "$mountpoint/$d" ]; then
+                rmdir $mountpoint/$d
+            fi
+            if [ ! -h $mountpoint/$d ]; then
+                rm -f $mountpoint/$d 2> /dev/null
+                (cd $mountpoint ; ln -s $thelink $d) || LogIt "ERROR: /$d is a symbolic link, but I couldn't create it in $mountpoint."
+            fi
+        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
@@ -3093 +3122 @@
     MODULES="$MODULES `/usr/sbin/esxcfg-module -l | $AWK '{print $1}'`"
 fi
-LogFile "Liste of extra modules is:" 
-LogFile "-------------" 
-LogFile "$EXTRA_MODS" 
 LogFile "-------------" 
 LogFile "FORCE_MODS:"

branches/3.0/mindi/parted2fdisk.pl

@@ -152 +152 @@
         "ext4" => "83",
         "xfs" => "83",
+        "btrfs" => "83",
         "reiserfs" => "83",
         "linux-swap" => "82",