Changeset 24 in MondoRescue for trunk/mondo

Timestamp:

Sep 16, 2005, 6:43:22 PM (20 years ago)

Author:

bcornec

Message:

Correct [ Bug #4991 ] -H option of mondoarchive is not completely automatic
​https://developer.berlios.de/bugs/?func=detailbug&bug_id=4991&group_id=2524

Not tested yet.

File:

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

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

@@ -2154 +2154 @@
 
   malloc_string(tmp);
-  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'.");
-        }
-    }
+  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
@@ -2189 +2187 @@
       strcpy(tmp,"M0nd0 h45 r3570r3d j00r 5y573m. P13453 r3m0v3 7h3 b4ckup m3d14 4nd r3b007.");
     }
-  popup_and_OK(tmp);
+  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);