Changeset 1337 in MondoRescue

Timestamp:

Apr 24, 2007, 3:26:29 PM (18 years ago)

Author:

Bruno Cornec

Message:

DidMondoCallme is gone (usage of MONDO_SHARE instead)
mindi log file only added to mondo logfile when useful (for --custom not for other options)

Location:

branches/stable/mindi

Files:

• ChangeLog (modified) (1 diff)
• mindi (modified) (4 diffs)

branches/stable/mindi/ChangeLog

@@ -3 +3 @@
 MINDI CHANGES
 
-1.2.2 (2007-04-15)
+1.2.2 (2007-04-16)
+- Add support for new megaraid driver (HP NetServers with 2.6) (P.C.J.G.Brunier)
+- Add support for adpahci (Proliant DL 140 G3 - SATA) (Abhijit Das/Bruno Cornec)
+- Mindi log file is now added to mondoarchive log file to ease debug (Bruno Cornec)
 - Suppress losetup usage in start-nfs (unreliable and doesn't work with QEMU (Bruno Cornec)
 - Fix a bug where losetup is called with only one parameter (#140) (Bruno Cornec)

branches/stable/mindi/mindi

@@ -426 +426 @@
     echo "Mindi $MINDI_VERSION is exiting" >> $LOGFILE
     echo "End date : `date`" >> $LOGFILE
-    if [ "`DidMondoCallMe`" ] ; then
+    if [ _"$MONDO_SHARE" != _"" ] ; then
         cat $LOGFILE >> /var/log/mondoarchive.log
     fi
@@ -2276 +2276 @@
     if [ -e "$MONDO_SHARE/restore-scripts" ]; then
         cp -Rdf $MONDO_SHARE/restore-scripts/* . 2>> $LOGFILE
-        [ "$?" -ne "0" ] && Die "Cannot find/install $MONDO_SHARE/restore-scripts"
+        [ "$?" -ne "0" ] && [ _"$MONDO_SHARE" != _"" ] && Die "Cannot find/install $MONDO_SHARE/restore-scripts"
     fi
     [ -d "/lib/dev-state" ] && cp --parents -pRdf /lib/dev-state . 2>> $LOGFILE
@@ -3089 +3089 @@
     if [ "$1" = "--findkernel" ] ; then
         res=`TryToFindKernelPath`
+        # Avoids logfile content for mondo
+        export MONDO_SHARE=""
         if [ "$res" = "" ] ; then
             MindiExit -1
@@ -3098 +3100 @@
         [ ! "$2" ] && Die "Please specify the output file"
         MakeMountlist $2
+        # Avoids logfile content for mondo
+        export MONDO_SHARE=""
         MindiExit $?
     elif [ "$1" = "-V" ] || [ "$1" = "-v" ] || [ "$1" = "--version" ] || [ "$1" = "-version" ] ; then
         echo "Mindi v$MINDI_VERSION"
+        # Avoids logfile content for mondo
+        export MONDO_SHARE=""
         MindiExit 0
     elif [ "$1" = "--custom" ] ; then