Changeset 426 in MondoRescue for trunk/mondo/mondo/mondorestore

Timestamp:

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

Author:

bcornec

Message:

merge -r421:425 $SVN_M/branches/stable

Location:

trunk/mondo/mondo/mondorestore

Files:

• Makefile.am (modified) (1 diff)
• mondo-restore-EXT.h (modified) (1 diff)
• mondo-restore.c (modified) (2 diffs)
• mondo-rstr-tools.c (modified) (1 diff)
• mondo-rstr-tools.h (modified) (1 diff)

trunk/mondo/mondo/mondorestore/Makefile.am

@@ -12 +12 @@
 mondorestore_SOURCES  = mondo-prep.c mondo-restore.c mondo-rstr-newt.c \
                         mondo-rstr-compare.c mondo-rstr-tools.c
-mondorestore_LDADD    = ../common/libmondo.la ../common/libmondo-newt.la @MONDORESTORE_STATIC@
+mondorestore_LDADD    = ${top_builddir}/mondo/common/libmondo.a @MONDORESTORE_STATIC@

trunk/mondo/mondo/mondorestore/mondo-restore-EXT.h

@@ -72 +72 @@
 extern void sort_mountlist_by_mountpoint(struct mountlist_itself *, bool);
 extern void sort_mountlist_by_device(struct mountlist_itself *);
-extern void success_message(void);
 extern void twenty_seconds_til_yikes(void);
 extern int run_raw_mbr(bool offer_to_hack_scripts, char *bd);

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;

trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -2060 +2060 @@
 
 
-
-
-
-
-/**
- * Prompt the user to support the Mondo project.
- */
-void success_message(void)
-{
-    int i;
-    /* malloc and ptr */
-    char *tmp;
-
-    malloc_string(tmp);
-    if (strstr
-        (call_program_and_get_last_line_of_output("cat /proc/cmdline"),
-         "restore") == NULL) {
-        if (ask_me_yes_or_no
-            ("Have you contributed to the Mondo project financially or in some other way, yet?"))
-        {
-            log_to_screen
-                ("Thank you for supporting Mondo. It goes from strength to strength,");
-            log_to_screen("thanks to the support of users like you.");
-        } else {
-            if (ask_me_yes_or_no
-                ("Are you or your company willing to consider contributing to Mondo in some way?"))
-            {
-                popup_and_OK
-                    ("To support the project which has just performed a valuable service for you, please visit http://www.mondorescue.com; click on 'Download' and then 'PayPal'.");
-            } else {
-                log_to_screen
-                    ("Free Software, like freedom itself, must be supported or it will be lost.");
-                log_msg(1,
-                        "To your credit, you were honest: you said no, you wouldn't be contributing");
-                log_msg(1,
-                        "to this project, ever. However, that makes you a freeloader. I bet you're");
-                log_msg(1,
-                        "the sort of person who likes to sneak into movie theatres...");
-                popup_and_OK
-                    ("If you ever change your mind, you may support this product by going to http://www.mondrescue.com and clicking on 'Download', followed by 'PalPal'.");
-            }
-        }
-    }
-#ifdef FREELOADER
-    i = (int) (random()) % 32;
-#else
-    i = 1;
-#endif
-
-    if (i != 25) {
-        strcpy(tmp,
-               "Mondo has restored your system. Please remove the backup media and reboot.");
-    } else {
-        strcpy(tmp,
-               "M0nd0 h45 r3570r3d j00r 5y573m. P13453 r3m0v3 7h3 b4ckup m3d14 4nd r3b007.");
-    }
-    if (strstr
-        (call_program_and_get_last_line_of_output("cat /proc/cmdline"),
-         "restore") == NULL) {
-        popup_and_OK(tmp);
-    }
-    log_to_screen(tmp);
-    paranoid_free(tmp);
-}
-
-/**************************************************************************
- *END_SUCCESS_MESSAGE                                                     *
- **************************************************************************/
-
-
-
 /**
  * Exit due to a signal (normal cleanup).

trunk/mondo/mondo/mondorestore/mondo-rstr-tools.h

@@ -27 +27 @@
 void setup_global_filenames(struct s_bkpinfo *bkpinfo);
 //void setup_signals(int);
-void success_message(void);
 void twenty_seconds_til_yikes(void);
 int run_raw_mbr(bool offer_to_hack_scripts, char *bd);