Changeset 2731 in MondoRescue for branches/2.2.9/mindi/mindi

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

File:

• branches/2.2.9/mindi/mindi (modified) (2 diffs)

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"