Changeset 1335


Ignore:
Timestamp:
Apr 24, 2007, 3:18:48 PM (12 years ago)
Author:
bruno
Message:

DidMondoCallme? is gone (usage of MONDO_SHARE instead)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.3/mindi/mindi

    r1328 r1335  
    414414
    415415
    416 DidMondoCallMe() {
    417     local res
    418 
    419     res=0
    420     [ "`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 
    425416# Last function called before exiting
    426417# Parameter is exit code value
     
    430421    echo "Mindi $MINDI_VERSION is exiting" >> $LOGFILE
    431422    echo "End date : `date`" >> $LOGFILE
    432     if [ "`DidMondoCallMe`" ] ; then
     423    if [ _"$MONDO_SHARE" != _"" ] ; then
    433424        cat $LOGFILE >> /var/log/mondoarchive.log
    434425    fi
     
    760751        [ "$modres" -eq "3" ] && echo -en "\t|"
    761752    done
    762     if [ "`DidMondoCallMe`" ] ; then
     753    if [ _"$MONDO_SHARE" != _"" ] ; then
    763754        mkdir -p $bigdir/tmp
    764755        mkdir -p $bigdir/sbin
     
    15841575OfferToMakeBootableISO() {
    15851576    local i old_pwd
    1586     if [ "$PROMPT_MAKE_CD_IMAGE" = "yes" ] && [ ! "`DidMondoCallMe`" ] ; then
     1577    if [ "$PROMPT_MAKE_CD_IMAGE" = "yes" ] && [ _"$MONDO_SHARE" = _"" ] ; then
    15871578        echo -en "Shall I make a bootable CD image? (y/[n]) "
    15881579        read i
     
    16631654    fi
    16641655    if [ "$disksize" -gt "2880" ] ; then
    1665         if [ "`DidMondoCallMe`" ] ; then
     1656        if [ _"$MONDO_SHARE" != _"" ] ; then
    16661657            if [ "$CDRECOVERY" != "yes" ] ; then
    16671658                if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
     
    17591750    if [ "$CDRECOVERY" = "yes" ] ; then
    17601751        echo -en "default=RESTORE\n"
    1761     elif [ "$disksize" -gt "2880" ] && [ "`DidMondoCallMe`" ] ; then
     1752    elif [ "$disksize" -gt "2880" ] && [ _"$MONDO_SHARE" != _"" ] ; then
    17621753        if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
    17631754            echo -en "default=iso\n"
     
    17801771        options="RESTORE expert"
    17811772    elif [ "$disksize" -gt "2880" ] ; then
    1782         if [ "`DidMondoCallMe`" ] ; then
     1773        if [ _"$MONDO_SHARE" != _"" ] ; then
    17831774            if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
    17841775                options="iso"
     
    21462137    FindAndAddUserKeyboardMappingFile
    21472138    mkdir -p $bigdir/tmp
    2148     if [ "`DidMondoCallMe`" ] ; then
     2139    if [ _"$MONDO_SHARE" != _"" ] ; then
    21492140        MakeMondoConfigFile $MINDI_TMP/mondo-restore.cfg
    21502141        cp -f $MINDI_TMP/mondo-restore.cfg $bigdir/tmp &> /dev/null
     
    21862177    if [ -e "$MONDO_SHARE/restore-scripts" ] ; then
    21872178        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"
    21892180    fi
    21902181    [ -d "/lib/dev-state" ] && cp --parents -pRdf /lib/dev-state . 2>> $LOGFILE
     
    22032194    mkdir -p $minidir_root/$noof_disks/tmp
    22042195    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>> $LOGFILE
     2196    [ _"$MONDO_SHARE" != _"" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MINDI_TMP/. 2>> $LOGFILE
    22062197    [ $LVM != "false" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm || LVM="false"
    22072198    cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
     
    26652656    dd if=/dev/zero of=$mountpoint/zero &> /dev/null
    26662657    rm -f $mountpoint/zero
    2667     if [ "`DidMondoCallMe`" ] ; then
     2658    if [ _"$MONDO_SHARE" != _"" ] ; then
    26682659        MakeMondoConfigFile $mountpoint/tmp/mondo-restore.cfg
    26692660        cp -f $mountpoint/tmp/mondo-restore.cfg $MINDI_TMP &> /dev/null
     
    27552746    cd $minidir_root/all
    27562747    size_of_all_tools=`du -sk . | cut -f1`
    2757     if [ "`DidMondoCallMe`" ] ; then
     2748    if [ _"$MONDO_SHARE" != _"" ] ; then
    27582749        for q in filelist.full.gz biggielist.txt ; do
    27592750            [ ! -e "$MINDI_TMP/$q" ] && Die "Cannot find $MINDI_TMP/$q"
     
    30293020
    30303021[ -e "$iso_cfg_file" ] || Die "Cannot find $iso_cfg_file"
    3031 if [ ! "`DidMondoCallMe`" ] ; then
     3022if [ _"$MONDO_SHARE" = _"" ] ; then
    30323023    LogIt "Mindi Linux mini-distro generator v$MINDI_VERSION"
    30333024    LogIt "Latest Mindi is available from http://www.mondorescue.org"
     
    30693060
    30703061if [ "$kernelpath" = "" ] ; then
    3071     [ "`DidMondoCallMe`" ] && Die "Please use -k <path> to specify kernel."
     3062    [ _"$MONDO_SHARE" != _"" ] && Die "Please use -k <path> to specify kernel."
    30723063    echo -en "Do you want to use your own kernel to build the boot disk ([y]/n) ?"
    30733064    read ch
     
    30863077    fi
    30873078fi
    3088 if [ ! "`DidMondoCallMe`" ] ; then
     3079if [ _"$MONDO_SHARE" = _"" ] ; then
    30893080    echo -en "Would you like to use LILO (instead of syslinux)\nfor your boot CD/floppies (y/[n]) ?"
    30903081    read ch
     
    31493140...Or type 'memtest' to test your PC's RAM thoroughly.\n"
    31503141
    3151 if [ ! "`DidMondoCallMe`" ] ; then
     3142if [ _"$MONDO_SHARE" = _"" ] ; then
    31523143    ListImagesForUser $CACHE_LOC
    31533144    boot_dev=/dev/fd0u1722
Note: See TracChangeset for help on using the changeset viewer.