Changeset 2685 in MondoRescue

Timestamp:

Sep 17, 2010, 12:51:29 AM (14 years ago)

Author:

Bruno Cornec

Message:

r4071@localhost: bruno | 2010-09-17 00:34:28 +0200

• Die and related functions placed before any other code as used early, and ash doesn't support function declaration. So will solve #446 by exiting mindi before doing anything weird in it.

File:

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

branches/2.2.9/mindi/mindi

@@ -109 +109 @@
 fi
 
+# Last function called before exiting
+# Parameter is exit code value
+# Should be declared here as used immediately below potentialy
+MindiExit() {
+    echo "Mindi $MINDI_VERSION is exiting" >> $LOGFILE
+    echo "End date : `date`" >> $LOGFILE
+    if [ _"$MONDO_SHARE" != _"" ] ; then
+        echo "------------- mindi logfile included -------------------------" >> /var/log/mondoarchive.log
+        cat $LOGFILE >> /var/log/mondoarchive.log
+        echo "--------------------------------------------------------------">> /var/log/mondoarchive.log
+    fi
+
+    cd /
+    sync&
+
+    # Clean temporary files only when standalone mindi
+    if [ _"$MINDI_TMP" != _"$MONDO_TMP" ]; then
+        rm -Rf $MINDI_TMP
+    fi
+    exit $1
+}
+
+LogIt() {
+    if [ -e /dev/stderr ] ; then
+        echo -e "$1" >> /dev/stderr
+    elif [ -e /usr/bin/logger ] ; then
+        /usr/bin/logger -s $1
+    fi
+    echo -e "$1" >> $LOGFILE
+    if [ _"$2" != _"" ]; then
+        grep -Ev "tar: Removing \`/\'" "$2" >> $LOGFILE
+    fi
+    rm -f "$2"
+}
+
+
+Die() {
+    local i
+    if [ "$1" = "" ] ; then
+        LogIt "FATAL ERROR"
+    else
+        LogIt "FATAL ERROR. $1"
+    fi
+    if [ _"$2" != _"" ]; then
+        grep -Ev "tar: Removing \`/\'" "$2" >> $LOGFILE
+    fi
+    rm -f "$2"
+
+    LogIt "Please e-mail a copy of $LOGFILE to the mailing list."
+    LogIt "See http://www.mondorescue.org for more information."
+    LogIt "WE CANNOT HELP unless you enclose that file.\n"
+    MindiExit -1
+}
+
 # Now we can create what we need
 MINDI_TMP=`mktemp -d $TMPDIR/mindi.XXXXXXXXXX`
@@ -237 +291 @@
     done
     echo $r
-}
-
-
-# Last function called before exiting
-# Parameter is exit code value
-MindiExit() {
-    echo "Mindi $MINDI_VERSION is exiting" >> $LOGFILE
-    echo "End date : `date`" >> $LOGFILE
-    if [ _"$MONDO_SHARE" != _"" ] ; then
-        echo "------------- mindi logfile included -------------------------" >> /var/log/mondoarchive.log
-        cat $LOGFILE >> /var/log/mondoarchive.log
-        echo "--------------------------------------------------------------">> /var/log/mondoarchive.log
-    fi
-
-    cd /
-    sync&
-
-    # Clean temporary files only when standalone mindi
-    if [ _"$MINDI_TMP" != _"$MONDO_TMP" ]; then
-        rm -Rf $MINDI_TMP
-    fi
-    exit $1
-}
-
-Die() {
-    local i
-    if [ "$1" = "" ] ; then
-        LogIt "FATAL ERROR"
-    else
-        LogIt "FATAL ERROR. $1"
-    fi
-    if [ _"$2" != _"" ]; then
-        grep -Ev "tar: Removing \`/\'" "$2" >> $LOGFILE
-    fi
-    rm -f "$2"
-
-    LogIt "Please e-mail a copy of $LOGFILE to the mailing list."
-    LogIt "See http://www.mondorescue.org for more information."
-    LogIt "WE CANNOT HELP unless you enclose that file.\n"
-    MindiExit -1
 }
 
@@ -906 +920 @@
     echo "$output"
     return 0
-}
-
-
-LogIt() {
-    if [ -e /dev/stderr ] ; then
-        echo -e "$1" >> /dev/stderr
-    elif [ -e /usr/bin/logger ] ; then
-        /usr/bin/logger -s $1
-    fi
-    echo -e "$1" >> $LOGFILE
-    if [ _"$2" != _"" ]; then
-        grep -Ev "tar: Removing \`/\'" "$2" >> $LOGFILE
-    fi
-    rm -f "$2"
 }