Changeset 1977 in MondoRescue for branches/stable/mondo/src/mondorestore/mondorestore.c

Timestamp:

Jun 2, 2008, 10:49:01 AM (16 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 1938:1976 $SVN_M/branches/2.2.6

File:

• branches/stable/mondo/src/mondorestore/mondorestore.c (modified) (11 diffs)

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -3324 +3324 @@
 
 extern int partition_everything(struct mountlist_itself *mountlist);
-
+extern int handle_incoming_parameters(int argc, char *argv[]);
 
 /**
@@ -3545 +3545 @@
     c = which_restore_mode();
     iamhere("post wrm");
-    if (c == 'I' || c == 'N' || c == 'C') {
+    if (c == 'I' || c == 'C') {
         interactively_obtain_media_parameters_from_user(FALSE);
+    } else if (c == 'N') {
+        // Auto mode nothing special to do
     } else {
         popup_and_OK("No restoring or comparing will take place today.");
@@ -3710 +3712 @@
         }
     }
-    
+
 #ifdef __FreeBSD__
     if (strstr
@@ -6398 +6400 @@
     }
 
-    if (argc == 3 && strcmp(argv[1], "-p") == 0) {
-        strcpy(bkpinfo->prefix,argv[2]);
-        log_msg(1,"Prefix forced to %s",bkpinfo->prefix);
-    }
-
-    if (argc == 3 && strcmp(argv[1], "-K") == 0) {
-        g_loglevel = atoi(argv[2]);
-        log_msg(1,"Loglevel forced to %s",g_loglevel);
-    }
-
     if (argc == 2 && strcmp(argv[1], "--live-grub") == 0) {
         retval = run_grub(FALSE, "/dev/hda");
@@ -6419 +6411 @@
         pause_and_ask_for_cdr(5, NULL);
         paranoid_MR_finish(0);
-    } else if (!bkpinfo->disaster_recovery) {   // live!
-        if (argc != 1) {
-            popup_and_OK
-                ("Live mode doesn't support command-line parameters yet.");
-            paranoid_MR_finish(1);
-//    return(1);
-        }
+    }
+    if ((argc == 2 && strcmp(argv[1], "--partition-only") == 0) && (bkpinfo->disaster_recovery)) {
+        log_msg(0, "Partitioning only.");
+        load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+        strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+        load_mountlist(mountlist, g_mountlist_fname);
+        res = partition_everything(mountlist);
+        finish(res);
+    }
+
+    if ((argc == 2 && strcmp(argv[1], "--format-only") == 0) && (bkpinfo->disaster_recovery)) {
+        log_msg(0, "Formatting only.");
+        load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+        strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+        load_mountlist(mountlist, g_mountlist_fname);
+        res = format_everything(mountlist, FALSE, raidlist);
+        finish(res);
+    }
+
+    if ((argc == 2 && strcmp(argv[1], "--stop-lvm-and-raid") == 0) && (bkpinfo->disaster_recovery)) {
+        log_msg(0, "Stopping LVM and RAID");
+        load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+        strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+        load_mountlist(mountlist, g_mountlist_fname);
+        res = do_my_funky_lvm_stuff(TRUE, FALSE);
+        res += stop_all_raid_devices(mountlist);
+        finish(res);
+    }
+
+    if ((argc > 1 && strcmp(argv[argc - 1], "--live-from-cd") == 0) && (!bkpinfo->disaster_recovery)) {
+        g_restoring_live_from_cd = TRUE;
+    }
+
+    // Handle params here first
+    handle_incoming_parameters(argc,argv);
+
+    if (!bkpinfo->disaster_recovery) {  // live!
         log_msg(1, "I am in normal, live mode.");
         log_msg(2, "FYI, MOUNTLIST_FNAME = %s", g_mountlist_fname);
         mount_boot_if_necessary();  /* for Gentoo users */
         log_msg(2, "Still here.");
-        if (argc > 1 && strcmp(argv[argc - 1], "--live-from-cd") == 0) {
-            g_restoring_live_from_cd = TRUE;
-        }
         if (bkpinfo->backup_media_type == nfs) {
             g_restoring_live_from_nfs = TRUE;
@@ -6439 +6458 @@
             retval =
                 restore_live_from_monitas_server(argv[2],
-                                                 argv[3], argv[4]);
+                                                argv[3], argv[4]);
         } else {
             log_msg(2, "Calling restore_to_live_filesystem()");
@@ -6455 +6474 @@
         log_msg(1, "I must be in disaster recovery mode.");
         log_msg(2, "FYI, MOUNTLIST_FNAME = %s ", g_mountlist_fname);
-        if (argc == 3 && strcmp(argv[1], "--monitas-memorex") == 0) {
-            log_to_screen("Uh, that hasn't been implemented yet.");
-            paranoid_MR_finish(1);
-        }
 
         iamhere("About to call load_mountlist and load_raidtab");
@@ -6468 +6483 @@
             ("Returned from calling load_mountlist and load_raidtab successfully");
 
-        if (argc > 1
-            && (strcmp(argv[1], "--compare") == 0
-                || strcmp(argv[1], "--nuke") == 0)) {
+        // BCO:To be reviewed
+        if ((bkpinfo->restore_mode == compare) || (bkpinfo->restore_mode == nuke)) {
             if (bkpinfo->backup_media_type == nfs
                 && !is_this_device_mounted(bkpinfo->nfs_mount)) {
@@ -6482 +6496 @@
         }
 
-
         if (retval) {
             log_to_screen
@@ -6488 +6501 @@
         }
 
-
         log_msg(1, "Send in the clowns.");
 
-        if (argc == 2 && strcmp(argv[1], "--partition-only") == 0) {
-            log_msg(0, "Partitioning only.");
-            load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-            strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
-            load_mountlist(mountlist, g_mountlist_fname);
-            res = partition_everything(mountlist);
-            finish(res);
-        }
-
-        if (argc == 2 && strcmp(argv[1], "--format-only") == 0) {
-            log_msg(0, "Formatting only.");
-            load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-            strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
-            load_mountlist(mountlist, g_mountlist_fname);
-            res = format_everything(mountlist, FALSE, raidlist);
-            finish(res);
-        }
-
-        if (argc == 2 && strcmp(argv[1], "--stop-lvm-and-raid") == 0) {
-            log_msg(0, "Stopping LVM and RAID");
-            load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-            strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
-            load_mountlist(mountlist, g_mountlist_fname);
-            res = do_my_funky_lvm_stuff(TRUE, FALSE);
-            res += stop_all_raid_devices(mountlist);
-            finish(res);
-        }
-
-        if (argc == 2 && strcmp(argv[1], "--nuke") == 0) {
+
+        if (bkpinfo->restore_mode == nuke) {
             iamhere("nuking");
             retval += nuke_mode(mountlist, raidlist);
-        } else if (argc == 2 && strcmp(argv[1], "--interactive") == 0) {
+        } else if (bkpinfo->restore_mode == interactive) {
             iamhere("catchall");
             retval += catchall_mode(mountlist, raidlist);
-        } else if (argc == 2 && strcmp(argv[1], "--compare") == 0) {
+        } else if (bkpinfo->restore_mode == compare) {
             iamhere("compare");
             retval += compare_mode(mountlist, raidlist);
-        } else if (argc == 2 && strcmp(argv[1], "--iso") == 0) {
+        } else if (bkpinfo->restore_mode == isoonly) {
             iamhere("iso");
             retval = iso_mode(mountlist, raidlist, FALSE);
-        } else if (argc == 2 && strcmp(argv[1], "--mbr") == 0) {
+        } else if (bkpinfo->restore_mode == mbr) {
             iamhere("mbr");
             retval = mount_all_devices(mountlist, TRUE);
@@ -6541 +6526 @@
                 log_to_screen("Failed to write Master Boot Record");
             }
-        } else if (argc == 2 && strcmp(argv[1], "--isonuke") == 0) {
+        } else if (bkpinfo->restore_mode == isonuke) {
             iamhere("isonuke");
             retval = iso_mode(mountlist, raidlist, TRUE);
-        } else if (argc != 1) {
-            log_to_screen("Invalid paremeters");
-            paranoid_MR_finish(1);
         } else {
             iamhere("catchall (no mode specified in command-line call");