Changeset 1736 in MondoRescue for branches/2.2.5/mondo/src/mondorestore/mondo-restore.c

Timestamp:

Oct 30, 2007, 1:45:03 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Adds USB support for mondorestore
• mount_cdrom => mount_media

File:

• branches/2.2.5/mondo/src/mondorestore/mondo-restore.c (modified) (5 diffs)

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

@@ -430 +430 @@
     read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
     iamhere("Done loading config file; resizing ML");
-    strcpy(tmp, bkpinfo->prefix);
-    if (popup_and_get_string
-        ("Prefix", "Prefix of your ISO images ?", tmp, MAX_STR_LEN / 4)) {
-        strcpy(bkpinfo->prefix, tmp);
-        log_msg(1, "Prefix set to %s",bkpinfo->prefix);
+    if (bkpinfo->backup_media_type != usb) {
+        strcpy(tmp, bkpinfo->prefix);
+        if (popup_and_get_string
+            ("Prefix", "Prefix of your ISO images ?", tmp, MAX_STR_LEN / 4)) {
+            strcpy(bkpinfo->prefix, tmp);
+            log_msg(1, "Prefix set to %s",bkpinfo->prefix);
+        }
     }
     
@@ -864 +866 @@
     if (retval) {
         log_to_screen("Errors occurred during the nuke phase.");
-    } else if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "RESTORE"))    // Bruno's thing
-    {
+    } else if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "RESTORE")) {
         log_to_screen
             ("PC was restored successfully. Thank you for using Mondo Rescue.");
@@ -927 +928 @@
     if (!g_restoring_live_from_cd) {
         popup_and_OK
-            ("Please insert tape/CD/boot floppy, then hit 'OK' to continue.");
+            ("Please insert tape/CD/USB Key/boot floppy, then hit 'OK' to continue.");
         sleep(1);
     }
@@ -2658 +2659 @@
     mvaddstr_and_log_it(g_currentY, 0, "Preparing to read your archives");
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        mount_cdrom();
+        mount_media();
         mvaddstr_and_log_it(g_currentY++, 0,
                             "Restoring OS and data from streaming media");
@@ -2676 +2677 @@
     } else {
         mvaddstr_and_log_it(g_currentY++, 0,
-                            "Restoring OS and data from CD       ");
-        mount_cdrom();
+                            "Restoring OS and data from CD/USB   ");
+        mount_media();
         resA = restore_all_tarballs_from_CD(filelist);
         resB = restore_all_biggiefiles_from_CD(filelist);