Changeset 1335 in MondoRescue

Timestamp:

Apr 24, 2007, 3:18:48 PM (17 years ago)

Author:

Bruno Cornec

Message:

DidMondoCallme is gone (usage of MONDO_SHARE instead)

File:

• branches/2.2.3/mindi/mindi (modified) (16 diffs)

branches/2.2.3/mindi/mindi

@@ -414 +414 @@
 
 
-DidMondoCallMe() {
-    local res
-
-    res=0
-    [ "`ps ax | grep -F "mondoarchive" | grep -v "grep"`" ] && res=$(($res+1))
-    [ -f "/var/run/monitas-mondo.pid" ] && res=$(($res+1))
-    [ "$res" -gt "1" ] && echo "yes"
-}
-
 # Last function called before exiting
 # Parameter is exit code value
@@ -430 +421 @@
     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
@@ -760 +751 @@
         [ "$modres" -eq "3" ] && echo -en "\t|"
     done
-    if [ "`DidMondoCallMe`" ] ; then
+    if [ _"$MONDO_SHARE" != _"" ] ; then
         mkdir -p $bigdir/tmp
         mkdir -p $bigdir/sbin
@@ -1584 +1575 @@
 OfferToMakeBootableISO() {
     local i old_pwd
-    if [ "$PROMPT_MAKE_CD_IMAGE" = "yes" ] && [ ! "`DidMondoCallMe`" ] ; then
+    if [ "$PROMPT_MAKE_CD_IMAGE" = "yes" ] && [ _"$MONDO_SHARE" = _"" ] ; then
         echo -en "Shall I make a bootable CD image? (y/[n]) "
         read i
@@ -1663 +1654 @@
     fi
     if [ "$disksize" -gt "2880" ] ; then
-        if [ "`DidMondoCallMe`" ] ; then
+        if [ _"$MONDO_SHARE" != _"" ] ; then
             if [ "$CDRECOVERY" != "yes" ] ; then
                 if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
@@ -1759 +1750 @@
     if [ "$CDRECOVERY" = "yes" ] ; then
         echo -en "default=RESTORE\n"
-    elif [ "$disksize" -gt "2880" ] && [ "`DidMondoCallMe`" ] ; then
+    elif [ "$disksize" -gt "2880" ] && [ _"$MONDO_SHARE" != _"" ] ; then
         if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
             echo -en "default=iso\n"
@@ -1780 +1771 @@
         options="RESTORE expert"
     elif [ "$disksize" -gt "2880" ] ; then
-        if [ "`DidMondoCallMe`" ] ; then
+        if [ _"$MONDO_SHARE" != _"" ] ; then
             if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
                 options="iso"
@@ -2146 +2137 @@
     FindAndAddUserKeyboardMappingFile
     mkdir -p $bigdir/tmp
-    if [ "`DidMondoCallMe`" ] ; then
+    if [ _"$MONDO_SHARE" != _"" ] ; then
         MakeMondoConfigFile $MINDI_TMP/mondo-restore.cfg
         cp -f $MINDI_TMP/mondo-restore.cfg $bigdir/tmp &> /dev/null
@@ -2186 +2177 @@
     if [ -e "$MONDO_SHARE/restore-scripts" ] ; then
         cp -Rdf $MONDO_SHARE/restore-scripts/* . 2>> $LOGFILE
-        [ "$?" -ne "0" ] && [ "`DidMondoCallMe`" ] && 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
@@ -2203 +2194 @@
     mkdir -p $minidir_root/$noof_disks/tmp
     cp -f $MINDI_TMP/mountlist.txt $minidir_root/$noof_disks/tmp/mountlist.txt 2> /dev/null || Die "Cannot copy mountlist.txt from $MINDI_TMP to data disk"
-    [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/. 2>> $LOGFILE
+    [ _"$MONDO_SHARE" != _"" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/. 2>> $LOGFILE
     [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm || LVM="false"
     cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
@@ -2665 +2656 @@
     dd if=/dev/zero of=$mountpoint/zero &> /dev/null
     rm -f $mountpoint/zero
-    if [ "`DidMondoCallMe`" ] ; then
+    if [ _"$MONDO_SHARE" != _"" ] ; then
         MakeMondoConfigFile $mountpoint/tmp/mondo-restore.cfg
         cp -f $mountpoint/tmp/mondo-restore.cfg $MINDI_TMP &> /dev/null
@@ -2755 +2746 @@
     cd $minidir_root/all
     size_of_all_tools=`du -sk . | cut -f1`
-    if [ "`DidMondoCallMe`" ] ; then
+    if [ _"$MONDO_SHARE" != _"" ] ; then
         for q in filelist.full.gz biggielist.txt ; do
             [ ! -e "$MINDI_TMP/$q" ] && Die "Cannot find $MINDI_TMP/$q"
@@ -3029 +3020 @@
 
 [ -e "$iso_cfg_file" ] || Die "Cannot find $iso_cfg_file"
-if [ ! "`DidMondoCallMe`" ] ; then
+if [ _"$MONDO_SHARE" = _"" ] ; then
     LogIt "Mindi Linux mini-distro generator v$MINDI_VERSION"
     LogIt "Latest Mindi is available from http://www.mondorescue.org"
@@ -3069 +3060 @@
 
 if [ "$kernelpath" = "" ] ; then
-    [ "`DidMondoCallMe`" ] && Die "Please use -k <path> to specify kernel."
+    [ _"$MONDO_SHARE" != _"" ] && Die "Please use -k <path> to specify kernel."
     echo -en "Do you want to use your own kernel to build the boot disk ([y]/n) ?"
     read ch
@@ -3086 +3077 @@
     fi
 fi
-if [ ! "`DidMondoCallMe`" ] ; then
+if [ _"$MONDO_SHARE" = _"" ] ; then
     echo -en "Would you like to use LILO (instead of syslinux)\nfor your boot CD/floppies (y/[n]) ?"
     read ch
@@ -3149 +3140 @@
 ...Or type 'memtest' to test your PC's RAM thoroughly.\n"
 
-if [ ! "`DidMondoCallMe`" ] ; then
+if [ _"$MONDO_SHARE" = _"" ] ; then
     ListImagesForUser $CACHE_LOC
     boot_dev=/dev/fd0u1722