Changeset 1612 in MondoRescue

Timestamp:

Sep 2, 2007, 2:45:09 AM (18 years ago)

Author:

Bruno Cornec

Message:

Fix #194

Location:

branches/2.2.5

Files:

• mindi/rootfs/sbin/init (modified) (1 diff)
• mindi/rootfs/sbin/post-init (modified) (2 diffs)
• mondo/src/mondorestore/mondo-restore.c (modified) (1 diff)

branches/2.2.5/mindi/rootfs/sbin/init

@@ -573 +573 @@
     LogIt "I think this CD/floppy has no archives on it."
 fi
-echo -en "Type 'exit' to reboot the PC\n"
-umount /mnt/cdrom 2> /dev/null
-mount / -o rw,remount > /dev/null 2> /dev/null
-LogIt "Launching Shell"
-sh
+if grep "RESTORE" /proc/cmdline > /dev/null 2> /dev/null ; then
+    echo "Rebooting in 10 seconds automatically as per reboot order"
+    echo -en "Press ^C to interrupt if you have to ..."
+    for i in 1 2 3 4 5 6 7 8 9 10 ; do
+        sleep 1
+        echo -en "."
+    done
+    echo "Boom."
+    sleep 1
+else
+    echo -en "Type 'exit' to reboot the PC\n"
+    umount /mnt/cdrom 2> /dev/null
+    mount / -o rw,remount > /dev/null 2> /dev/null
+    LogIt "Launching Shell"
+    sh
+fi
 CaughtSoftReset
 # reboot

branches/2.2.5/mindi/rootfs/sbin/post-init

@@ -121 +121 @@
                 mondorestore --nuke
             else
-            mondorestore; # MR will detect & access the tape
+                mondorestore; # MR will detect & access the tape
             fi
     fi
@@ -138 +138 @@
         fi
     else
-    LogIt "------------------EXPERT MODE------------------" 1
-    LogIt "You do all the work. :-)" 1
-    if which mondorestore > /dev/null 2> /dev/null ; then
+        LogIt "------------------EXPERT MODE------------------" 1
+        LogIt "You do all the work. :-)" 1
+        if which mondorestore > /dev/null 2> /dev/null ; then
             LogIt "Type 'mondorestore' to begin the restore/compare process." 1
-        loc=`which ISO 2> /dev/null`
+            loc=`which ISO 2> /dev/null`
         fi
     fi

branches/2.2.5/mondo/src/mondorestore/mondo-restore.c

@@ -879 +879 @@
     } else {
         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.");
-        if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "restore") == NULL) {
             popup_and_OK(tmp);
-        }
         log_to_screen
           ("Mondo has restored your system. Please wait for the command prompt.");