Changeset 425

Show
Ignore:
Timestamp:
02/22/06 12:58:02 (5 years ago)
Author:
bcornec
Message:

Applied Andree's patch to remove commercials :-)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/stable/mondo/mondo/common/my-stuff.h

    r402 r425  
    524524#define MNT_FLOPPY "/mnt/floppy" 
    525525 
    526 #define FREELOADER              // You're not a paying customer 
    527526#define DEFAULT_MR_LOGLEVEL 4 
    528527 
  • branches/stable/mondo/mondo/mondorestore/mondo-restore-EXT.h

    r128 r425  
    7272extern void sort_mountlist_by_mountpoint(struct mountlist_itself *, bool); 
    7373extern void sort_mountlist_by_device(struct mountlist_itself *); 
    74 extern void success_message(void); 
    7574extern void twenty_seconds_til_yikes(void); 
    7675extern int run_raw_mbr(bool offer_to_hack_scripts, char *bd); 
  • branches/stable/mondo/mondo/mondorestore/mondo-restore.c

    r296 r425  
    390390#include "mondo-rstr-tools-EXT.h" 
    391391 
    392 extern void success_message(void); 
    393392extern void twenty_seconds_til_yikes(void); 
    394393 
     
    12241223            ("PC was restored successfully. Thank you for using Mondo Rescue."); 
    12251224        log_to_screen 
    1226             ("Please visit http://www.mondorescue.org and thank the dev team."); 
     1225            ("Please visit our website at http://www.mondorescue.org for more information."); 
    12271226    } else { 
    1228 #ifdef FREELOADER 
    1229         success_message(); 
    1230 #else 
    1231         log_to_screen("PC was restored successfully!"); 
    1232 #endif 
     1227        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."); 
     1228        if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "restore") == NULL) { 
     1229            popup_and_OK(tmp); 
     1230        } 
     1231        log_to_screen 
     1232            ("Mondo has restored your system. Please remove the backup media and reboot."); 
     1233        log_to_screen 
     1234            ("Please visit our website at http://www.mondorescue.org for more information."); 
    12331235    } 
    12341236    g_I_have_just_nuked = TRUE; 
  • branches/stable/mondo/mondo/mondorestore/mondo-rstr-tools.c

    r305 r425  
    20782078 
    20792079 
    2080  
    2081  
    2082  
    2083  
    2084 /** 
    2085  * Prompt the user to support the Mondo project. 
    2086  */ 
    2087 void success_message(void) 
    2088 { 
    2089     int i; 
    2090     /* malloc and ptr */ 
    2091     char *tmp; 
    2092  
    2093     malloc_string(tmp); 
    2094     if (strstr 
    2095         (call_program_and_get_last_line_of_output("cat /proc/cmdline"), 
    2096          "restore") == NULL) { 
    2097         if (ask_me_yes_or_no 
    2098             ("Have you contributed to the Mondo project financially or in some other way, yet?")) 
    2099         { 
    2100             log_to_screen 
    2101                 ("Thank you for supporting Mondo. It goes from strength to strength,"); 
    2102             log_to_screen("thanks to the support of users like you."); 
    2103         } else { 
    2104             if (ask_me_yes_or_no 
    2105                 ("Are you or your company willing to consider contributing to Mondo in some way?")) 
    2106             { 
    2107                 popup_and_OK 
    2108                     ("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'."); 
    2109             } else { 
    2110                 log_to_screen 
    2111                     ("Free Software, like freedom itself, must be supported or it will be lost."); 
    2112                 log_msg(1, 
    2113                         "To your credit, you were honest: you said no, you wouldn't be contributing"); 
    2114                 log_msg(1, 
    2115                         "to this project, ever. However, that makes you a freeloader. I bet you're"); 
    2116                 log_msg(1, 
    2117                         "the sort of person who likes to sneak into movie theatres..."); 
    2118                 popup_and_OK 
    2119                     ("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'."); 
    2120             } 
    2121         } 
    2122     } 
    2123 #ifdef FREELOADER 
    2124     i = (int) (random()) % 32; 
    2125 #else 
    2126     i = 1; 
    2127 #endif 
    2128  
    2129     if (i != 25) { 
    2130         strcpy(tmp, 
    2131                "Mondo has restored your system. Please remove the backup media and reboot."); 
    2132     } else { 
    2133         strcpy(tmp, 
    2134                "M0nd0 h45 r3570r3d j00r 5y573m. P13453 r3m0v3 7h3 b4ckup m3d14 4nd r3b007."); 
    2135     } 
    2136     if (strstr 
    2137         (call_program_and_get_last_line_of_output("cat /proc/cmdline"), 
    2138          "restore") == NULL) { 
    2139         popup_and_OK(tmp); 
    2140     } 
    2141     log_to_screen(tmp); 
    2142     paranoid_free(tmp); 
    2143 } 
    2144  
    2145 /************************************************************************** 
    2146  *END_SUCCESS_MESSAGE                                                     * 
    2147  **************************************************************************/ 
    2148  
    2149  
    2150  
    21512080/** 
    21522081 * Exit due to a signal (normal cleanup). 
  • branches/stable/mondo/mondo/mondorestore/mondo-rstr-tools.h

    r128 r425  
    2727void setup_global_filenames(struct s_bkpinfo *bkpinfo); 
    2828//void setup_signals(int); 
    29 void success_message(void); 
    3029void twenty_seconds_til_yikes(void); 
    3130int run_raw_mbr(bool offer_to_hack_scripts, char *bd);