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

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

Location:

branches/stable/mondo/src/mondorestore

Files:

• mondo-rstr-tools.c (modified) (8 diffs)
• mondorestore.c (modified) (11 diffs)
• mondorestore.h (modified) (1 diff)

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -56 +56 @@
 
 extern void kill_anything_like_this(char *str);
+extern int skip_obdr(void);
 
 /**
@@ -72 +73 @@
     mr_free(g_mondo_cfg_file);
     mr_free(g_mountlist_fname);
+    mr_free(g_mondo_home);
     mr_free(g_tmpfs_mountpt);
     mr_free(g_isodir_device);
@@ -887 +889 @@
         bkpinfo->use_star = TRUE;
         mr_msg(1, "Goody! ... bkpinfo->use_star is now true.");
+    }
+
+    read_cfg_var(cfg_file, "obdr", value);
+    if (strstr(value, "yes")) {
+        bkpinfo->use_obdr = TRUE;
+        log_msg(1, "OBDR mode activated");
     }
 
@@ -1786 +1794 @@
 
 /**
- * Turn signal trapping on or off.
- * @param on If TRUE, then do full cleanup when we receive a signal; if FALSE, then 
- * print a message and exit immediately.
- */
-void set_signals(int on)
-{
-    int signals[] =
-        { SIGKILL, SIGPIPE, SIGTERM, SIGHUP, SIGTRAP, SIGABRT, SIGINT,
-        SIGSTOP, 0
-    };
-    int i;
-    for (i = 0; signals[i]; i++) {
-        if (on) {
-            signal(signals[i], terminate_daemon);
-        } else {
-            signal(signals[i], termination_in_progress);
-        }
-    }
-}
-
-/**************************************************************************
- *END_SET_SIGNALS                                                         *
- **************************************************************************/
-
-
-/**
  * malloc() and set sensible defaults for the mondorestore filename variables.
  * @param bkpinfo The backup information structure. Fields used:
@@ -1895 +1877 @@
 /**************************************************************************
  *END_STREAMLINE_CHANGES_FILE                                             *
- **************************************************************************/
-
-
-/**
- * Exit due to a signal (normal cleanup).
- * @param sig The signal we're exiting due to.
- */
-void terminate_daemon(int sig)
-{
-    log_to_screen
-        (_("Mondorestore is terminating in response to a signal from the OS"));
-    free_MR_global_filenames();
-    finish(254);
-}
-/**************************************************************************
- *END_TERMINATE_DAEMON                                                    *
  **************************************************************************/
 
@@ -1941 +1907 @@
 /**************************************************************************
  *END_TWENTY_SECONDS_TIL_YIKES                                            *
- **************************************************************************/
-
-
-/**
- * Exit due to a signal (no cleanup).
- * @param sig The signal we're exiting due to.
- */
-void termination_in_progress(int sig)
-{
-    mr_msg(1, "Termination in progress");
-    usleep(1000);
-    pthread_exit(0);
-}
-/**************************************************************************
- *END_TERMINATION_IN_PROGRESS                                             *
  **************************************************************************/
 
@@ -2011 +1962 @@
                                    "/mnt/.boot.d", 5);
     }
+
+    /* Unmounting the local /proc and /sys first */
+    run_program_and_log_output("umount " MNT_RESTORING "/proc",3);
+    run_program_and_log_output("umount " MNT_RESTORING "/sys",3);
+
     for (lino = mountlist->entries - 1; lino >= 0; lino--) {
         if (!strcmp(mountlist->el[lino].mountpoint, "lvm")) {
@@ -2081 +2037 @@
     // BERLIOS: below 32KB seems to block at least on RHAS 2.1 and MDK 10.0
 
+    if (bkpinfo->use_obdr) {
+        skip_obdr();
+    }
     // tar -zxvf-
     mr_asprintf(&command,

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");

branches/stable/mondo/src/mondorestore/mondorestore.h

@@ -9 +9 @@
  */
 char *MONDO_LOGFILE = "/var/log/mondorestore.log";
+char *MONDO_OPTIONS = "E:GI:J:K:QRT:UVZ:b:d:ef:gimn:op:tux:z";
 
 /* Busybox ps has no option and PID in first pos */