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

Timestamp:

Dec 1, 2014, 11:35:39 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Backport most mindi modifications done in the 3.2 branch into 3.0 in order to have soon a 2.1.8 version which is probably Fedora 17+ compatible (all modifications up to 2014-10-16)

File:

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

branches/3.0/mindi/mindi

@@ -373 +373 @@
     local r res mapfile mappath included_item included_list keyfile mp locale
     LogAll "INFO: Analyzing your keyboard's configuration."
-    KEYDIR=/lib/kbd
+    KEYDIR=/usr/lib/kbd
     [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share/kbd     # Slackware
     [ ! -e "$KEYDIR" ] && KEYDIR=/usr/lib/kbd
-    [ ! -e "$KEYDIR" ] && KEYDIR=/lib/kbd
     [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share
     [ ! -e "$KEYDIR" ] && KEYDIR=/etc/condole
     [ ! -e "$KEYDIR" ] && KEYDIR=/etc/condole-setup
+    [ ! -e "$KEYDIR" ] && KEYDIR=/lib/kbd
     if [ ! -e "$KEYDIR" ] ; then
         LogAll "WARNING: Keyboard mapping directory not found. I shall use default map at boot-time."
@@ -387 +387 @@
         LogFile "INFO: Red Hat-style config detected."
         keyfile=/etc/sysconfig/keyboard
+    elif [ -e "/etc/vconsole.conf" ] ; then
+        LogFile "INFO: New Fedora style config detected."
+        keyfile=/etc/vconsole.conf
     elif [ -e "/etc/rc.d/rc.keymap" ] ; then
         LogFile "INFO: Slackware-style config detected."
@@ -445 +448 @@
     locale=`grep -F KEYTABLE "$keyfile" | grep -v '^#' | tr -d '"' |cut -d'=' -f2 | sed 's/.map.gz$//'`
     [ ! "$locale" ] && locale=`grep '.map$' "$keyfile" | sed 's/^.* //'`        # Slackware
-    [ ! "$locale" ] && locale=`grep -E '^KEYMAP=' "$keyfile" | grep -v '^#' | tr -d '"' |cut -d'=' -f2`     # Gentoo & ArchLinux
+    [ ! "$locale" ] && locale=`grep -E '^KEYMAP=' "$keyfile" | grep -v '^#' | tr -d '"' |cut -d'=' -f2`     # Gentoo, ArchLinux & New fedora
     [ ! "$locale" ] && locale=`grep -E 'XkbLayout' "$keyfile" | grep -v '^#' | awk '{print $3}' | tr -d '"'`        #  Fedora 19
     LogFile "INFO: locale=$locale"
@@ -487 +490 @@
 FindLdlinux32Binary() {
     LDLINUXC32=/usr/lib/syslinux/ldlinux.c32
-    [ ! -e "$LDLINUXC32" ] && LDLINUXC32=/usr/lib/syslinux/ldlinux.c32
     [ ! -e "$LDLINUXC32" ] && LDLINUXC32=/usr/lib64/syslinux/ldlinux.c32
     [ ! -e "$LDLINUXC32" ] && LDLINUXC32=/usr/share/syslinux/ldlinux.c32
     [ ! -e "$LDLINUXC32" ] && LDLINUXC32=/usr/share/lib/syslinux/ldlinux.c32
     [ ! -e "$LDLINUXC32" ] && LDLINUXC32=/usr/share/lib64/syslinux/ldlinux.c32
+    [ ! -e "$LDLINUXC32" ] && LDLINUXC32=/usr/lib/syslinux/modules/bios/ldlinux.c32
+    [ ! -e "$LDLINUXC32" ] && LDLINUXC32=/usr/lib64/syslinux/modules/bios/ldlinux.c32
     #[ ! -e "$LDLINUXC32" ] && LDLINUXC32=`find / -name ldlinux.c32 | grep -x "/.*/ldlinux.c32"`
     if [ ! -e "$LDLINUXC32" ]; then 
@@ -504 +508 @@
 FindMboot32Binary() {
     MBOOTC32=/usr/lib/syslinux/mboot.c32
-    [ ! -e "$MBOOTC32" ] && MBOOTC32=/usr/lib/syslinux/mboot.c32
     [ ! -e "$MBOOTC32" ] && MBOOTC32=/usr/lib64/syslinux/mboot.c32
     [ ! -e "$MBOOTC32" ] && MBOOTC32=/usr/share/syslinux/mboot.c32
     [ ! -e "$MBOOTC32" ] && MBOOTC32=/usr/share/lib/syslinux/mboot.c32
     [ ! -e "$MBOOTC32" ] && MBOOTC32=/usr/share/lib64/syslinux/mboot.c32
+    [ ! -e "$MBOOTC32" ] && MBOOTC32=/usr/lib/syslinux/modules/bios/mboot.c32
+    [ ! -e "$MBOOTC32" ] && MBOOTC32=/usr/lib64/syslinux/modules/bios/mboot.c32
     [ ! -e "$MBOOTC32" ] && MBOOTC32=`find / -name mboot.c32 | grep -x "/.*/mboot.c32"`
     [ ! -e "$MBOOTC32" ] && Die "Please install mboot.c32 first. If your syslinux RPM doesn't include mboot.c32, you may download an isolinux RPM from Mondo's website - go to http://www.mondorescue.org/downloads.shtml"
@@ -521 +526 @@
     [ ! -e "$ISOLINUX" ] && ISOLINUX=/usr/share/lib/syslinux/isolinux.bin
     [ ! -e "$ISOLINUX" ] && ISOLINUX=/usr/share/lib64/syslinux/isolinux.bin
+    [ ! -e "$ISOLINUX" ] && ISOLINUX=/usr/lib/ISOLINUX/isolinux.bin
     [ ! -e "$ISOLINUX" ] && ISOLINUX=`find / -name isolinux.bin | grep -x "/.*/isolinux.bin"`
     [ ! -e "$ISOLINUX" ] && Die "Please install isolinux first. If your syslinux RPM doesn't include isolinux, you may download an isolinux RPM from Mondo's website - go to http://www.mondorescue.org/downloads.shtml"
@@ -729 +735 @@
     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
@@ -1760 +1766 @@
             if [ -e "$MINDI_TMP/NETFS-DEV" ] ; then
                 echo -en "Press <enter> to continue.\n"
+                echo -en "$BOOT_MEDIA_MESSAGE"
             elif [ ! "$MINDI_TMP" ] ; then
                 echo -en "FYI, this is _not_ a Mondo Rescue CD.\n"
@@ -2385 +2392 @@
         if [ "$?" -eq "0" ] ; then
             # Used by ia64
-            fkern_ver=`gzip -cd $fname | strings 2> /dev/null | grep "[2-9]+*[.][0-9]+*[.][0-9]+*[^\@]*@"`
+            fkern_ver=`gzip -cd $fname | strings 2> /dev/null | grep -E "[2-9]+\.[0-9]+\.[0-9]+[^\@]*@"`
         else
-            fkern_ver=`strings $fname 2> /dev/null | grep "[2-9]+*[.][0-9]+*[.][0-9]+*[^\@]*@"`
+            fkern_ver=`strings $fname 2> /dev/null | grep -E "[2-9]+\.[0-9]+\.[0-9]+[^\@]*@"`
         fi
         echo "$fkern_ver"
@@ -2586 +2593 @@
     # Copy of files mandatory for ssh to automate mount if sshfs is used
     mkdir $mountpoint/.ssh
-    cp -rp ~root/.ssh/* $mountpoint/.ssh 2> /dev/null
-    echo > $mountpoint/tmp/myssh << EOF
+    cp -a ~root/.ssh/* $mountpoint/.ssh 2> /dev/null
+    cat > $mountpoint/tmp/myssh << EOF
 ssh -o StrictHostKeyChecking=no $*
 EOF
@@ -2593 +2600 @@
 
     # Copy of files mandatory for ld.so
-    cp -rp /etc/ld.so.c* $mountpoint/etc
+    cp -a /etc/ld.so.c* $mountpoint/etc
 
     # Handle the case where busybox and mount are dynamically linked
@@ -2602 +2609 @@
     fi
 
-    # Copy of files from the minimal env needed as per the deplist.d/minimal.conf file (which includes all busybox deps)
+    # Copy of files from the minimal env needed as per the deplist.d/minimal.conf & udev.conf file (which includes all busybox deps)
     rm -f $MINDI_TMP/minimal.lis $MINDI_TMP/minimal2.lis
-    for f in `grep -v " *#.*" $DEPLIST_DIR/minimal.conf | sort -u`; do
-        if [ -r $f ]; then
-            echo $f >> $MINDI_TMP/minimal.lis
-            LocateDeps $f >> $MINDI_TMP/minimal2.lis
+    for f in `cat $DEPLIST_DIR/minimal.conf $DEPLIST_DIR/udev.conf | grep -vE " *#.*|^#" | sort -u` ; do
+        if [ -d $f ]; then
+            for g in `find $f`; do 
+                echo $g >> $MINDI_TMP/minimal.lis
+                LocateDeps $g  >> $MINDI_TMP/minimal2.lis
+            done
+        else 
+            if [ -r $f ]; then
+                echo $f >> $MINDI_TMP/minimal.lis
+                LocateDeps $f >> $MINDI_TMP/minimal2.lis
+            fi
         fi
     done
@@ -2640 +2654 @@
         LogIt "INFO: udev device manager found"
         tar cf - -C / /etc/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogIt "ERROR: Problem in /etc/udev analysis" $MINDI_TMP/$$.log
-        # This avoids NIC remapping if on another machine at restore time on Debian at least
-        rm -f ./etc/udev/rules.d/z[0-9][0-9]_persistent-net.rules
-        # This avoids NIC remapping if on another machine at restore time on Ubuntu at least
-        rm -f ./etc/udev/rules.d/[0-9][0-9]-persistent-net.rules
+        # This avoids NIC remapping if on another machine at restore time on Debian/Ubuntu at least
+        rm -f ./etc/udev/rules.d/[z]*[0-9][0-9][-_]persistent-net.rules
         # Do not do it if it's a link (Ubuntu 64 bits #503)
-        if [ -e "/lib64/udev" ] && [ ! -h "/lib64" ] && [  ! -h "/lib64/udev" ]; then
+        if [ -e "/lib64/udev" ] && [ ! -h "/lib64" ] && [ ! -h "/lib64/udev" ]; then
             tar cf - -C / /lib64/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogIt "ERROR: Problem in /lib64/udev analysis" $MINDI_TMP/$$.log
         fi
@@ -2653 +2665 @@
         if [ -e "/lib/udev" ] && [ ! -h "/lib" ] && [  ! -h "/lib/udev" ]; then
             tar cf - -C / /lib/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogIt "ERROR: Problem in /lib/udev analysis" $MINDI_TMP/$$.log
+        fi
+        if [ -e "/usr/lib/udev" ] && [ ! -h "/usr/lib" ] && [  ! -h "/usr/lib/udev" ]; then
+            tar cf - -C / /usr/lib/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogIt "ERROR: Problem in /usr/lib/udev analysis" $MINDI_TMP/$$.log
         fi
         if [ -x /sbin/udevd ] || [ -x /usr/bin/udevd ] || [ -x /usr/lib/systemd/systemd-udevd ]; then
@@ -2664 +2679 @@
                     while [ -h $j ]; do
                         lis="$lis $j"
-                        j=`readlink $j`
+                        j=`readlink -f $j`
                     done
                     lis="$lis $j"
@@ -2678 +2693 @@
                     [ "$j" != "" ] && rm -f $j
                 fi
+                echo "$i" >> $MINDI_TMP/udev.lis
             done
             tar cf - -C / $lis `sort -u $MINDI_TMP/udev.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "ERROR: Problem in udev.lis analysis" $MINDI_TMP/$$.log
@@ -2776 +2792 @@
     # Copy FW in case some drivers needs it
     for d in "/lib" "/usr/lib"; do
-        if [ -d "$d/firmware" ]; then
+        if [ -d "$d/firmware" -a ! -h $d ]; then
             cp -a "$d/firmware" "$mountpoint/$d"
         fi
@@ -2783 +2799 @@
     # Copy multipath dynamic libraries in case multipath is used (RHEL 6.4 and later)
     for d in "/lib" "/usr/lib" "/lib64" "/usr/lib64"; do
-        if [ -d "$d/multipath" ]; then
+        if [ -d "$d/multipath" -a ! -h $d ]; then
             cp -a "$d/multipath" "$mountpoint/$d"
         fi