Changeset 426 in MondoRescue for trunk/mondo/mondo/mondorestore/mondo-restore.c

Timestamp:

Feb 23, 2006, 4:09:24 PM (18 years ago)

Author:

bcornec

Message:

merge -r421:425 $SVN_M/branches/stable

File:

• trunk/mondo/mondo/mondorestore/mondo-restore.c (modified) (2 diffs)

trunk/mondo/mondo/mondorestore/mondo-restore.c

@@ -392 +392 @@
 #endif
 
-extern void success_message(void);
 extern void twenty_seconds_til_yikes(void);
 
@@ -1226 +1225 @@
             ("PC was restored successfully. Thank you for using Mondo Rescue.");
         log_to_screen
-            ("Please visit http://www.mondorescue.org and thank the dev team.");
+            ("Please visit our website at http://www.mondorescue.org for more information.");
     } else {
-#ifdef FREELOADER
-        success_message();
-#else
-        log_to_screen("PC was restored successfully!");
-#endif
+        strcpy(tmp," Mondo has restored your system. Please 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 remove the backup media and reboot.");
+        log_to_screen
+            ("Please visit our website at http://www.mondorescue.org for more information.");
     }
     g_I_have_just_nuked = TRUE;