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

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 ...

Location:

branches/2.2.6/mondo/src/mondorestore

Files:

• mondo-rstr-newt.c (modified) (1 diff)
• mondo-rstr-tools.c (modified) (4 diffs)
• mondorestore.c (modified) (4 diffs)
• mondorestore.h (modified) (1 diff)

branches/2.2.6/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -2330 +2330 @@
  * @param isodir_device Where to put the device (e.g. /dev/hda4) the user enters.
  * @param isodir_format Where to put the format (e.g. ext2) the user enters.
- * @param isodir_path Where to put the path (e.g. /root/images/mondo) the user enters.
+ * @param isodir_path Where to put the path (e.g. /var/cache/mondo) the user enters.
  * @param nuke_me_please Whether we're planning on nuking or not.
  * @return TRUE if OK was pressed, FALSE otherwise.

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

@@ -177 +177 @@
 * Free the malloc()s for the filename variables.
 */
-void free_MR_global_filenames()
+void free_MR_global_filenames(void)
 {
 paranoid_free(g_biggielist_txt);
 paranoid_free(g_filelist_full);
 paranoid_free(g_filelist_imagedevs);
-//  paranoid_free (g_imagedevs_pot );
 paranoid_free(g_imagedevs_restthese);
 paranoid_free(g_mondo_cfg_file);
@@ -1973 +1972 @@
 
 
-
-
-/**
- * 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.
@@ -2092 +2064 @@
 
 /**
- * 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");
-    paranoid_MR_finish(254);
-}
-
-/**************************************************************************
- *END_TERMINATE_DAEMON                                                    *
- **************************************************************************/
-
-
-/**
  * Give the user twenty seconds to press Ctrl-Alt-Del before we nuke their drives.
  */
@@ -2137 +2093 @@
  *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)
-{
-    log_msg(1, "Termination in progress");
-    usleep(1000);
-    pthread_exit(0);
-}
-
-/**************************************************************************
- *END_TERMINATION_IN_PROGRESS                                             *
- **************************************************************************/
-
 
 

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

branches/2.2.6/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 */