Changeset 1966 in MondoRescue

Timestamp:

May 29, 2008, 10:38:12 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Begin modifications to allow mondorestore to use handle_incoming_parameters so that it could take command line params as well.

Location:

branches/2.2.6/mondo/src

Files:

• common/libmondo-cli.c (modified) (1 diff)
• common/libmondo-tools.c (modified) (4 diffs)
• mondorestore/mondorestore.c (modified) (7 diffs)

branches/2.2.6/mondo/src/common/libmondo-cli.c

@@ -787 +787 @@
     if (flag_set['p']) {
         strncpy(bkpinfo->prefix, flag_val['p'], MAX_STR_LEN / 4);
+        log_msg(1,"Prefix forced to %s",bkpinfo->prefix);
     }
 

branches/2.2.6/mondo/src/common/libmondo-tools.c

@@ -848 +848 @@
     memset((void *) bkpinfo, 0, sizeof(struct s_bkpinfo));
 
-    sensibly_set_tmpdir_and_scratchdir();
-
-    bkpinfo->manual_cd_tray = FALSE;
-    bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
     bkpinfo->media_device[0] = '\0';
     for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
@@ -860 +856 @@
     bkpinfo->zip_exe[0] = '\0';
     bkpinfo->zip_suffix[0] = '\0';
-    bkpinfo->restore_path[0] = '\0';
+    bkpinfo->image_devs[0] = '\0';
+    bkpinfo->compression_level = 3;
     bkpinfo->use_lzo = FALSE;
     bkpinfo->use_gzip = FALSE;
@@ -867 +864 @@
     bkpinfo->backup_data = FALSE;
     bkpinfo->restore_data = FALSE;
+    bkpinfo->use_star = FALSE;
+    bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
     bkpinfo->disaster_recovery =
         (am_I_in_disaster_recovery_mode()? TRUE : FALSE);
@@ -875 +874 @@
     }
     strcpy(bkpinfo->prefix, STD_PREFIX);
-
+    sensibly_set_tmpdir_and_scratchdir();
+
+    bkpinfo->optimal_set_size = 0;
+    strcpy(bkpinfo->include_paths, "/");
     bkpinfo->make_filelist = TRUE;  // unless -J supplied to mondoarchive
-    bkpinfo->optimal_set_size = 0;
-    bkpinfo->backup_media_type = none;
-    strcpy(bkpinfo->include_paths, "/");
+    bkpinfo->include_paths[0] = '\0';
     bkpinfo->exclude_paths[0] = '\0';
+    bkpinfo->restore_path[0] = '\0';
     bkpinfo->call_before_iso[0] = '\0';
     bkpinfo->call_make_iso[0] = '\0';
     bkpinfo->call_burn_iso[0] = '\0';
     bkpinfo->call_after_iso[0] = '\0';
-    bkpinfo->image_devs[0] = '\0';
-    bkpinfo->postnuke_tarball[0] = '\0';
     bkpinfo->kernel_path[0] = '\0';
     bkpinfo->nfs_mount[0] = '\0';
     bkpinfo->nfs_remote_dir[0] = '\0';
+    bkpinfo->postnuke_tarball[0] = '\0';
     bkpinfo->wipe_media_first = FALSE;
-    bkpinfo->differential = FALSE;
+    bkpinfo->differential = 0;
+    bkpinfo->please_dont_eject = FALSE;
     bkpinfo->cdrw_speed = 0;
-// patch by Herman Kuster  
-    bkpinfo->differential = 0;
-// patch end
-    bkpinfo->compression_level = 3;
+    bkpinfo->manual_cd_tray = FALSE;
+    bkpinfo->nonbootable_backup = FALSE;
+    bkpinfo->make_cd_use_lilo = FALSE;
+    bkpinfo->use_obdr = FALSE;
 }
 

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

@@ -3121 +3121 @@
     }
 
-    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 %d",g_loglevel);
-    }
-
     if (argc == 2 && strcmp(argv[1], "--live-grub") == 0) {
         retval = run_grub(FALSE, "/dev/hda");
@@ -3142 +3132 @@
         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;
@@ -3162 +3179 @@
             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()");
@@ -3178 +3195 @@
         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");
@@ -3191 +3204 @@
             ("Returned from calling load_mountlist and load_raidtab successfully");
 
+        // BCO:To be reviewed
         if (argc > 1
             && (strcmp(argv[1], "--compare") == 0
@@ -3205 +3219 @@
         }
 
-
         if (retval) {
             log_to_screen
@@ -3211 +3224 @@
         }
 
-
         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) {