Changeset 3281 in MondoRescue

Timestamp:

Apr 30, 2014, 7:58:11 PM (11 years ago)

Author:

Bruno Cornec

Message:

• /usr/sbin/dmeventd is now needed by systemd for dm dev creation (seen with LVM)
• Keyboard detection needs to be done after MRCFG creation
• Avoids error msgs in grub detection (when grub2 is in fact used)

Location:

branches/3.2

Files:

• mindi/deplist.d/udev.conf (modified) (1 diff)
• mindi/mindi (modified) (3 diffs)
• mondo/src/common/libmondo-archive.c (modified) (1 diff)

branches/3.2/mindi/deplist.d/udev.conf

@@ -17 +17 @@
 /etc/udev
 /etc/hotplug.d
+
+/usr/sbin/dmeventd
 
 # On ArchLinux

branches/3.2/mindi/mindi

@@ -1729 +1729 @@
         if [ "$CDRECOVERY" != "yes" ] ; then
             if [ -e "$MINDI_TMP/NETFS-SERVER-MOUNT" ] ; then
-                echo -en "Press <enter> for network restore\n"
+                echo -en "Press <0eenter07> for 0cnetwork restore07\n"
                 echo -en "$BOOT_MEDIA_MESSAGE"
             elif [ ! "$MINDI_TMP" ] ; then
@@ -2093 +2093 @@
         Die "You have $res files present in dependency list\nbut absent from filesystem."
     fi
-    FindAndAddUserKeyboardMappingFile
     mkdir -p $bigdir/tmp
     if [ _"$MONDO_SHARE" != _"" ]; then
@@ -2100 +2099 @@
         cp -f $MINDI_TMP/$MRCFG $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

branches/3.2/mondo/src/common/libmondo-archive.c

@@ -683 +683 @@
             fatal_error("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst, /boot/grub/grub.cfg, or /boot/grub2/grub.cfg but I cannot find it there. What is wrong with your Linux distribution?");
         }
-        mr_asprintf(bootldr_ver, "%s", call_program_and_get_last_line_of_output("grub --version"));
+        mr_asprintf(bootldr_ver, "%s", call_program_and_get_last_line_of_output("grub --version 2> /dev/null"));
         if (strcmp(bootldr_ver,"") ==0) {
             mr_free(bootldr_ver);