Changeset 2731 in MondoRescue

Timestamp:

Feb 26, 2011, 5:37:13 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Adds functions and /bin/loadkeys (new location) to minimal set of commands to have
• provides a makemessage option to mindi and this function now works with pbdistrocheck
• Do not create an error when a phys device has 0 size and is a /dev/dm-* device

Location:

branches/2.2.9

Files:

• mindi/deplist.d/minimal.conf (modified) (1 diff)
• mindi/mindi (modified) (2 diffs)
• mindi/rootfs/sbin/init (modified) (1 diff)
• mondo/src/common/libmondo-mountlist.c (modified) (1 diff)

branches/2.2.9/mindi/deplist.d/minimal.conf

@@ -18 +18 @@
 /bin/df
 /usr/bin/loadkeys
+/bin/loadkeys
 /sbin/pidof
 /usr/bin/reboot
+/etc/init.d/functions
 
 # Compression

branches/2.2.9/mindi/mindi

@@ -1598 +1598 @@
     if [ -x "/bin/lsb_release" ]; then
         DESC=`/bin/lsb_release -d | cut -d: -f2 | sed "s/[ \t]*//"`
+    elif [ -r /etc/issue.net ]
+        DESC=`head -1 /etc/issue.net`
+    elif [ -r /etc/issue ]
+        DESC=`head -1 /etc/issue`
     elif [ -x "/usr/bin/pbdistrocheck" ]; then
         # For pb >= 0.9.8
-        DESC=`/usr/bin/pbdistrocheck -d`
-    else
-        iss="/dev/null"
-        [ -r /etc/issue.net ] && iss="/etc/issue.net"
-        [ -r /etc/issue ] && iss="/etc/issue"
-        DESC=`head -1 $iss`
+        DESC=`/usr/bin/pbdistrocheck -s | cut -d, -f1-4`
+    else
+        DESC="Unknown desc"
     fi
     sed "s/ZZZZZ/$MINDI_VERSION/" $MINDI_LIB/msg-txt | sed "s/KKKKK/Kernel $KERVER/" | sed "s/AAAAA/on a $ARCH architecture/" | sed "s/TTTTT/`LC_TIME=C date`/" | sed "s/MMMMM/`hostname`/" | sed "s/DDDDD/$DESC/"
@@ -2867 +2868 @@
         export MONDO_SHARE=""
         MindiExit $?
+    elif [ "$1" = "--makemessage" ] ; then
+        MakeMessageFile
+        MindiExit 0
     elif [ "$1" = "--makemountlist" ] ; then
         [ ! "$2" ] && Die "Please specify the output file"

branches/2.2.9/mindi/rootfs/sbin/init

@@ -108 +108 @@
     if which loadkeys > /dev/null 2> /dev/null ; then
         loadkeys $fname
-# loadkmap != loadkeys
-#    elif which loadkmap > /dev/null 2> /dev/null ; then
-#        loadkmap < $fname
     else
-        LogIt "Using default keyboard map." 1
+        LogIt "Using default US keyboard map." 1
     fi
 }

branches/2.2.9/mondo/src/common/libmondo-mountlist.c

@@ -399 +399 @@
 
     if (physical_drive_size < 0) {
-        mr_asprintf(&tmp, " %s does not exist.", drive);
-        log_it(tmp);
-        mr_strcat(flaws_str, "%s", tmp);
-        res++;
-        mr_free(tmp);
-        goto endoffunc;
+        if (strstr(drive,"/dev/dm-") != NULL) {
+            mr_asprintf(&tmp, " %s does not exist.", drive);
+            log_it(tmp);
+            mr_strcat(flaws_str, "%s", tmp);
+            res++;
+            mr_free(tmp);
+            goto endoffunc;
+        } else {
+            mr_asprintf(&tmp, " %s (dm) will be setup later on", drive);
+            log_it(tmp);
+            mr_free(tmp);
+        }
     } else {
         mr_asprintf(&tmp, "%s is %ld MB", drive, physical_drive_size);