Changeset 3257 in MondoRescue

Timestamp:

Mar 6, 2014, 11:24:24 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Remove debug print in Kernel.pm which solves wrong inclusion of kernel modules in boot media
• Add support for latest Fedora keymap file (/etc/vconsole.conf) and non us keyboard detection
• Improve initramfs detection for recent kernels (RE updated)
• Fix udev deps inclusion by mimicing what was done for minimal

Location:

branches/3.2

Files:

• MondoRescue/lib/MondoRescue/Kernel.pm (modified) (1 diff)
• mindi/mindi (modified) (6 diffs)

branches/3.2/MondoRescue/lib/MondoRescue/Kernel.pm

@@ -94 +94 @@
     next if (/^Module/);
     ($module, $void) = split(/ /);
-    print "***$module***|***$void***\n";
+    pb_log(2,"***$module***|***$void***\n");
     push @alllivemodules,$module;
 }

branches/3.2/mindi/mindi

@@ -388 +388 @@
         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."
@@ -446 +449 @@
     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"
@@ -711 +714 @@
     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
@@ -2622 +2625 @@
                 echo "$i" >> $MINDI_TMP/udev.lis
             done
+            finallist=""
+            # Remove directories from the list, as tar/cp will create them anyway
+            # and it may hurt if /lib is in it as on Debian/Ubuntu
+            # recent bash says that -d is true for a link to a dir !
+            for f in `sort -u $MINDI_TMP/udev.lis`; do
+                if [ -e $f -a ! -d $f ] || [ -h $f ]; then
+                    finallist="$finallist $f"
+                fi
+            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
-            echo "cp -a -n --parents `sort -u $MINDI_TMP/udev.lis` -t $mountpoint/" 2>&1 >> $MINDI_TMP/$$.log
-            cp -a -n --parents `sort -u $MINDI_TMP/udev.lis` -t $mountpoint/ 2>> $MINDI_TMP/$$.log  || LogIt "ERROR: Problem in udev.lis analysis" $MINDI_TMP/$$.log
+            echo "cp -a -n --parents $finallist -t $mountpoint/" 2>&1 >> $MINDI_TMP/$$.log
+            cp -a -n --parents $finallist -t $mountpoint/ 2>> $MINDI_TMP/$$.log  || LogIt "ERROR: Problem in udev.lis analysis" $MINDI_TMP/$$.log
             rm -f $MINDI_TMP/udev.lis
         else
@@ -2681 +2693 @@
     if [ "${kernelname}" != "" ]; then
         needed_modules_path=lib/modules/${kernelname}
-        mkgmopt="-k $needed_modules_path"
+        mkgmopt="-k ${kernelname}"
     else
         needed_modules_path=lib/modules/$KERVERRUN
@@ -2690 +2702 @@
     needed_modules=`mr-kernel-get-modules $mkgmopt $list_of_groovy_mods`
 
-    LogFile "INFO: Adding $needed_modules to the rootfs"
+    LogFile "INFO: Adding $needed_modules to the rootfs with $mkgmopt"
     cp --parents -aL $needed_modules $mountpoint/ 2>> $MINDI_TMP/$$.log || LogIt "ERROR: Unable to copy modules to $mountpoint" $MINDI_TMP/$$.log