Changeset 1612


Ignore:
Timestamp:
Sep 2, 2007, 2:45:09 AM (12 years ago)
Author:
bruno
Message:

Fix #194

Location:
branches/2.2.5
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mindi/rootfs/sbin/init

    r1610 r1612  
    573573    LogIt "I think this CD/floppy has no archives on it."
    574574fi
    575 echo -en "Type 'exit' to reboot the PC\n"
    576 umount /mnt/cdrom 2> /dev/null
    577 mount / -o rw,remount > /dev/null 2> /dev/null
    578 LogIt "Launching Shell"
    579 sh
     575if grep "RESTORE" /proc/cmdline > /dev/null 2> /dev/null ; then
     576    echo "Rebooting in 10 seconds automatically as per reboot order"
     577    echo -en "Press ^C to interrupt if you have to ..."
     578    for i in 1 2 3 4 5 6 7 8 9 10 ; do
     579        sleep 1
     580        echo -en "."
     581    done
     582    echo "Boom."
     583    sleep 1
     584else
     585    echo -en "Type 'exit' to reboot the PC\n"
     586    umount /mnt/cdrom 2> /dev/null
     587    mount / -o rw,remount > /dev/null 2> /dev/null
     588    LogIt "Launching Shell"
     589    sh
     590fi
    580591CaughtSoftReset
    581592# reboot
  • branches/2.2.5/mindi/rootfs/sbin/post-init

    r1315 r1612  
    121121                mondorestore --nuke
    122122            else
    123             mondorestore; # MR will detect & access the tape
     123                mondorestore; # MR will detect & access the tape
    124124            fi
    125125    fi
     
    138138        fi
    139139    else
    140     LogIt "------------------EXPERT MODE------------------" 1
    141     LogIt "You do all the work. :-)" 1
    142     if which mondorestore > /dev/null 2> /dev/null ; then
     140        LogIt "------------------EXPERT MODE------------------" 1
     141        LogIt "You do all the work. :-)" 1
     142        if which mondorestore > /dev/null 2> /dev/null ; then
    143143            LogIt "Type 'mondorestore' to begin the restore/compare process." 1
    144         loc=`which ISO 2> /dev/null`
     144            loc=`which ISO 2> /dev/null`
    145145        fi
    146146    fi
  • branches/2.2.5/mondo/src/mondorestore/mondo-restore.c

    r1611 r1612  
    879879    } else {
    880880        strcpy(tmp,"Mondo has restored your system.\n\nPlease wait for the command prompt. Then remove the backup media and reboot.\n\nPlease visit our website at http://www.mondorescue.org for more information.");
    881         if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "restore") == NULL) {
    882881            popup_and_OK(tmp);
    883         }
    884882        log_to_screen
    885883          ("Mondo has restored your system. Please wait for the command prompt.");
Note: See TracChangeset for help on using the changeset viewer.