Changeset 3426 in MondoRescue

Timestamp:

Aug 27, 2015, 2:02:34 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix some log msgs
• Fix DESC on RHEL7

File:

• branches/3.2/mindi/mindi (modified) (3 diffs)

branches/3.2/mindi/mindi

@@ -1712 +1712 @@
             DESC="$DESC $(tac /var/log/pacman.log | grep -m1 'full system upgrade' | cut -d']' -f1)]"
         fi
+    elif [ -x "/etc/os-release" ]; then
+        DESC=`grep PRETTY_NAME /etc/os-release | cut -d= -f2`
+    elif [ -x "/usr/bin/pbdistrocheck" ]; then
+        # For pb >= 0.9.8
+        DESC=`/usr/bin/pbdistrocheck -s | cut -d, -f1-4 | sed 's/,/-/g'`
     elif [ -r /etc/issue.net ]; then
         DESC=`head -1 /etc/issue.net`
     elif [ -r /etc/issue ]; then
         DESC=`head -1 /etc/issue`
-    elif [ -x "/usr/bin/pbdistrocheck" ]; then
-        # For pb >= 0.9.8
-        DESC=`/usr/bin/pbdistrocheck -s | cut -d, -f1-4`
     else
         DESC="Unknown desc"
@@ -3199 +3201 @@
            kernelname=$KERVERRUN
         else
-           LogAll "Using modules for kernel: ${kernelname}"
+           LogAll "INFO: Using modules for kernel: ${kernelname}"
         fi
         LogAll "INFO: kernelname = $kernelname"
@@ -3263 +3265 @@
     LogIt "------------------------------------------------------------------------------"
 else
-    LogFile "INFO: You are using Mindi-Linux v$MINDI_VERSION to make boot+data disks"
+    LogFile "INFO: You are using Mindi v$MINDI_VERSION to make boot+data disks"
 fi
 if [ -f $MINDI_LIB/rootfs/usr/bin/busybox ]; then
-    LogIt "Mindi-`$MINDI_LIB/rootfs/usr/bin/busybox 2>&1 | head -1`"
+    LogIt "INFO: Mindi-`$MINDI_LIB/rootfs/usr/bin/busybox 2>&1 | head -1`"
 else
     LogIt "ERROR: Unable to find mindi-busybox, please install it"