Changeset 1335 in MondoRescue
- Timestamp:
- Apr 24, 2007, 3:18:48 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.3/mindi/mindi
r1328 r1335 414 414 415 415 416 DidMondoCallMe() {417 local res418 419 res=0420 [ "`ps ax | grep -F "mondoarchive" | grep -v "grep"`" ] && res=$(($res+1))421 [ -f "/var/run/monitas-mondo.pid" ] && res=$(($res+1))422 [ "$res" -gt "1" ] && echo "yes"423 }424 425 416 # Last function called before exiting 426 417 # Parameter is exit code value … … 430 421 echo "Mindi $MINDI_VERSION is exiting" >> $LOGFILE 431 422 echo "End date : `date`" >> $LOGFILE 432 if [ "`DidMondoCallMe`" ] ; then423 if [ _"$MONDO_SHARE" != _"" ] ; then 433 424 cat $LOGFILE >> /var/log/mondoarchive.log 434 425 fi … … 760 751 [ "$modres" -eq "3" ] && echo -en "\t|" 761 752 done 762 if [ "`DidMondoCallMe`" ] ; then753 if [ _"$MONDO_SHARE" != _"" ] ; then 763 754 mkdir -p $bigdir/tmp 764 755 mkdir -p $bigdir/sbin … … 1584 1575 OfferToMakeBootableISO() { 1585 1576 local i old_pwd 1586 if [ "$PROMPT_MAKE_CD_IMAGE" = "yes" ] && [ ! "`DidMondoCallMe`" ] ; then1577 if [ "$PROMPT_MAKE_CD_IMAGE" = "yes" ] && [ _"$MONDO_SHARE" = _"" ] ; then 1587 1578 echo -en "Shall I make a bootable CD image? (y/[n]) " 1588 1579 read i … … 1663 1654 fi 1664 1655 if [ "$disksize" -gt "2880" ] ; then 1665 if [ "`DidMondoCallMe`" ] ; then1656 if [ _"$MONDO_SHARE" != _"" ] ; then 1666 1657 if [ "$CDRECOVERY" != "yes" ] ; then 1667 1658 if [ -e "$MINDI_TMP/NFS-DEV" ] ; then … … 1759 1750 if [ "$CDRECOVERY" = "yes" ] ; then 1760 1751 echo -en "default=RESTORE\n" 1761 elif [ "$disksize" -gt "2880" ] && [ "`DidMondoCallMe`" ] ; then1752 elif [ "$disksize" -gt "2880" ] && [ _"$MONDO_SHARE" != _"" ] ; then 1762 1753 if [ -e "$MINDI_TMP/NFS-DEV" ] ; then 1763 1754 echo -en "default=iso\n" … … 1780 1771 options="RESTORE expert" 1781 1772 elif [ "$disksize" -gt "2880" ] ; then 1782 if [ "`DidMondoCallMe`" ] ; then1773 if [ _"$MONDO_SHARE" != _"" ] ; then 1783 1774 if [ -e "$MINDI_TMP/NFS-DEV" ] ; then 1784 1775 options="iso" … … 2146 2137 FindAndAddUserKeyboardMappingFile 2147 2138 mkdir -p $bigdir/tmp 2148 if [ "`DidMondoCallMe`" ] ; then2139 if [ _"$MONDO_SHARE" != _"" ] ; then 2149 2140 MakeMondoConfigFile $MINDI_TMP/mondo-restore.cfg 2150 2141 cp -f $MINDI_TMP/mondo-restore.cfg $bigdir/tmp &> /dev/null … … 2186 2177 if [ -e "$MONDO_SHARE/restore-scripts" ] ; then 2187 2178 cp -Rdf $MONDO_SHARE/restore-scripts/* . 2>> $LOGFILE 2188 [ "$?" -ne "0" ] && [ "`DidMondoCallMe`" ] && Die "Cannot find/install $MONDO_SHARE/restore-scripts"2179 [ "$?" -ne "0" ] && [ _"$MONDO_SHARE" != _"" ] && Die "Cannot find/install $MONDO_SHARE/restore-scripts" 2189 2180 fi 2190 2181 [ -d "/lib/dev-state" ] && cp --parents -pRdf /lib/dev-state . 2>> $LOGFILE … … 2203 2194 mkdir -p $minidir_root/$noof_disks/tmp 2204 2195 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" 2205 [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/. 2>> $LOGFILE2196 [ _"$MONDO_SHARE" != _"" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/. 2>> $LOGFILE 2206 2197 [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm || LVM="false" 2207 2198 cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE … … 2665 2656 dd if=/dev/zero of=$mountpoint/zero &> /dev/null 2666 2657 rm -f $mountpoint/zero 2667 if [ "`DidMondoCallMe`" ] ; then2658 if [ _"$MONDO_SHARE" != _"" ] ; then 2668 2659 MakeMondoConfigFile $mountpoint/tmp/mondo-restore.cfg 2669 2660 cp -f $mountpoint/tmp/mondo-restore.cfg $MINDI_TMP &> /dev/null … … 2755 2746 cd $minidir_root/all 2756 2747 size_of_all_tools=`du -sk . | cut -f1` 2757 if [ "`DidMondoCallMe`" ] ; then2748 if [ _"$MONDO_SHARE" != _"" ] ; then 2758 2749 for q in filelist.full.gz biggielist.txt ; do 2759 2750 [ ! -e "$MINDI_TMP/$q" ] && Die "Cannot find $MINDI_TMP/$q" … … 3029 3020 3030 3021 [ -e "$iso_cfg_file" ] || Die "Cannot find $iso_cfg_file" 3031 if [ ! "`DidMondoCallMe`" ] ; then3022 if [ _"$MONDO_SHARE" = _"" ] ; then 3032 3023 LogIt "Mindi Linux mini-distro generator v$MINDI_VERSION" 3033 3024 LogIt "Latest Mindi is available from http://www.mondorescue.org" … … 3069 3060 3070 3061 if [ "$kernelpath" = "" ] ; then 3071 [ "`DidMondoCallMe`" ] && Die "Please use -k <path> to specify kernel."3062 [ _"$MONDO_SHARE" != _"" ] && Die "Please use -k <path> to specify kernel." 3072 3063 echo -en "Do you want to use your own kernel to build the boot disk ([y]/n) ?" 3073 3064 read ch … … 3086 3077 fi 3087 3078 fi 3088 if [ ! "`DidMondoCallMe`" ] ; then3079 if [ _"$MONDO_SHARE" = _"" ] ; then 3089 3080 echo -en "Would you like to use LILO (instead of syslinux)\nfor your boot CD/floppies (y/[n]) ?" 3090 3081 read ch … … 3149 3140 ...Or type 'memtest' to test your PC's RAM thoroughly.\n" 3150 3141 3151 if [ ! "`DidMondoCallMe`" ] ; then3142 if [ _"$MONDO_SHARE" = _"" ] ; then 3152 3143 ListImagesForUser $CACHE_LOC 3153 3144 boot_dev=/dev/fd0u1722
Note:
See TracChangeset
for help on using the changeset viewer.