Changeset 1977 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-rstr-tools.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/mondo-rstr-tools.c (modified) (8 diffs)

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,