Changeset 1967 in MondoRescue for branches/2.2.6/mondo/src/mondorestore/mondorestore.c

Timestamp:

May 29, 2008, 5:40:05 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Remove all references to /root/images
• Fix the lack of support for options in mondorestore by copying what is done for mondoarchive and sharing the functions analyzing the cli (getopt usage)
• Review the now common handle_incoming_parameters to have it support correctly 2 modes (archiving and restoring)
• Update mondorestore man page to take in account the options supported now
• Replace mondorestore options --nuke, --interactive, with -Z nuke, -Z interactive ...

File:

• branches/2.2.6/mondo/src/mondorestore/mondorestore.c (modified) (4 diffs)

branches/2.2.6/mondo/src/mondorestore/mondorestore.c

@@ -3160 +3160 @@
         finish(res);
     }
-        
+
     if ((argc > 1 && strcmp(argv[argc - 1], "--live-from-cd") == 0) && (!bkpinfo->disaster_recovery)) {
         g_restoring_live_from_cd = TRUE;
@@ -3205 +3205 @@
 
         // BCO:To be reviewed
-        if (argc > 1
-            && (strcmp(argv[1], "--compare") == 0
-                || strcmp(argv[1], "--nuke") == 0)) {
+        if ((bkpinfo->restore_mode == compare) || (bkpinfo->restore_mode == nuke)) {
             if (bkpinfo->backup_media_type == nfs
                 && !is_this_device_mounted(bkpinfo->nfs_mount)) {
@@ -3227 +3225 @@
 
 
-        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);
@@ -3249 +3247 @@
                 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");