Changeset 1967 in MondoRescue

Timestamp:

May 29, 2008, 5:40:05 PM (17 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

Files:

• mindi/mindi (modified) (1 diff)
• mindi/rootfs/sbin/post-init (modified) (4 diffs)
• mondo-doc/mondoarchive.8 (modified) (2 diffs)
• mondo-doc/mondorescue-howto.sgml (modified) (4 diffs)
• mondo-doc/mondorestore.8 (modified) (2 diffs)
• mondo/src/common/libmondo-archive.c (modified) (2 diffs)
• mondo/src/common/libmondo-cli.c (modified) (38 diffs)
• mondo/src/common/libmondo-filelist.c (modified) (1 diff)
• mondo/src/common/libmondo-tools.c (modified) (4 diffs)
• mondo/src/common/mondostructures.h (modified) (6 diffs)
• mondo/src/mondoarchive/mondoarchive.c (modified) (1 diff)
• mondo/src/mondoarchive/mondoarchive.h (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-newt.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (4 diffs)
• mondo/src/mondorestore/mondorestore.c (modified) (4 diffs)
• mondo/src/mondorestore/mondorestore.h (modified) (1 diff)

branches/2.2.6/mindi/mindi

@@ -1672 +1672 @@
             else
                 options="interactive expert compare iso nuke isonuke"
-# hda hdb hdc hdd"
             fi
         else

branches/2.2.6/mindi/rootfs/sbin/post-init

@@ -115 +115 @@
 if [ "$compare" ] ; then
     LogIt "------------------COMPARE MODE-----------------" 1
-    mondorestore $mondoopt --compare
+    mondorestore $mondoopt -Z compare
 elif [ "$nuke" ] ; then
     LogIt "-------------------NUKE MODE-------------------" 1
-    mondorestore $mondoopt --nuke
+    mondorestore $mondoopt -Z nuke
 elif [ "$expert" ] ; then
     if [ "`grep tapedev /tmp/mondo-restore.cfg`" ] ; then
@@ -128 +128 @@
         LogIt "Tape Mode -- calling mondorestore..."
             if [ "$nuke" ] ; then
-                mondorestore $mondoopt --nuke
+                mondorestore $mondoopt -Z nuke
             else
                 mondorestore $mondoopt; # MR will detect & access the tape
@@ -141 +141 @@
             LogIt "Cdstream Mode -- calling mondorestore..."
             if [ "$nuke" ] ; then
-                mondorestore --nuke $mondoopt
+                mondorestore -Z nuke $mondoopt
             else
                 mondorestore $mondoopt; # MR will detect & access the cdstream
@@ -156 +156 @@
 else
     LogIt "------------------INTERACTIVE------------------" 1
-    mondorestore --interactive $mondoopt
+    mondorestore -Z interactive $mondoopt
 fi
 
-[ -e "/tmp/DO-MBR-PLEASE" ] && LogIt "PLEASE RUN 'mondorestore --mbr' NOW TO INITIALIZE YOUR BOOT SECTOR." 1
+[ -e "/tmp/DO-MBR-PLEASE" ] && LogIt "PLEASE RUN 'mondorestore -Z mbr' NOW TO INITIALIZE YOUR BOOT SECTOR." 1
 
 exit 0

branches/2.2.6/mondo-doc/mondoarchive.8

@@ -186 +186 @@
 this is the directory where the ISO images are stored. For NFS users, this is
 the directory within the NFS mount where the backups are stored. The default
-for ISO and NFS is '/root/images/mondo'.
+for ISO and NFS is '/var/cache/mondo'.
 
 .TP
@@ -305 +305 @@
 .TP
 .BI "-e "
-Don't eject the CD or tape when backing up or restoring... unless cdrecord
-insists on it. If it does, well, tough. Sorry. :)
+Don't eject the CD or tape when backing up...
 
 .TP

branches/2.2.6/mondo-doc/mondorescue-howto.sgml

@@ -469 +469 @@
 <row>
 <entry>
-        bash# cd /root/images/mindi
+        bash# cd /var/cache/mindi
 
 </entry>
@@ -575 +575 @@
 <row>
 <entry>
-bash# cdrecord dev=0,0,0 speed=4 -eject -v /root/images/mindi/mindi.iso
+        bash# cdrecord dev=0,0,0 speed=4 -eject -v /var/cache/mindi/mindi.iso
 </entry>
 </row>
@@ -1255 +1255 @@
 Making 2880KB boot disk...........................mkfs.vfat 2.10 (22 Sep 2003)
 ... 2880 KB boot disks were created OK                          Done.
-In the directory '/root/images/mindi' you will find the images:-
+In the directory '/var/cache/mindi' you will find the images:-
    mindi-data-1.img    mindi-data-2.img    mindi-data-3.img    mindi-data-4.img    mindi-data-5.img mindi-root.1440.img
 Shall I make a bootable CD image? (y/n) y
@@ -1281 +1281 @@
 <row>
 <entry>
-        bash# cd /root/images/mindi
+        bash# cd /var/cache/mindi
 </entry>
 </row>

branches/2.2.6/mondo-doc/mondorestore.8

@@ -45 +45 @@
 .B prefix 
 to specify the name of your ISO images.
-By default, mondoarchive names images mondorescue-1.iso, mondorescue-2.iso, ...
+By default, mondorestore names images mondorescue-1.iso, mondorescue-2.iso, ...
 Using 
 .B -p machine
@@ -52 +52 @@
 
 .TP
+.BI "-i "
+Use ISO files (CD images) as restore media. This is good when having backed up your
+system to a spare hard drive. The
+.B -n
+switch is a wiser choice if you plan to restore from a remote filesystem.
+
+.TP
+.BI "-n " mount
+Use files residing on NFS partition as restore media.
+.I mount
+is the remote mount-point, e.g. '192.168.1.3:/home/nfs'
+for my file server. Please mount it before restoring/verifying.
+
+.TP
+.BI "-t "
+Use tape streamer as restore device and its tapes as restore media.
+
+.TP
+.BI "-U "
+Use a generic USB device as restore device. Use this if you want to read
+your backup from a USB key or USB disk.
+The USB device should be attached to the system ir order for this to work and
+its device name passed to the
+.BR \-d 
+option.
+
+.TP
+.BI "-u "
+Use a generic streaming device as restore device. Use this if you want to read
+your backup from a device that is not directly support by mondoarchive. This will
+get the data directly from a raw device.
+.B For experienced users only.
+
+.TP
+.BI "-E " "\*(lqpath ...\*(rq"
+Exclude path(s) from restore (future dev). The paths should be separated with a whitespace.
+/mnt/cdrom, /proc, /sys, /tmp). For example, if you are restoring up from an NFS mount but you
+do not want to restore some content, exclude it with that switch.
+
+.TP
+.BI "-I " "\*(lqpath ...\*(rq"
+Include paths(s) to retore (future dev). 
+
+.TP
+.BI "-J " "file"
+Specify an explicit list of files and directories to restore in a plain text file, one item
+(file or directory) per line. Beware that directories placed in that file are not managed recursively contrary to what is done with the -I option.
+
+.TP
+.BI "-d " "dev|dir"
+Specify the restore device (CD/tape/USB) or directory (NFS/ISO). For CD-R[W] drives,
+this is the SCSI node where the drive may be found, e.g. '0,1,0'. For tape
+users, this is the tape streamers /dev entry, e.g. '/dev/st0'. For USB users,
+this is the device name of your key or external disk. For ISO users,
+this is the directory where the ISO images are stored. For NFS users, this is
+the directory within the NFS mount where the backups are stored. The default
+for ISO and NFS is '/var/cache/mondo'.
+
+.TP
+.BI "-g "
+GUI mode. Without this switch, the screen output of mondorestore is text based.
+
+.TP
+.BI "-m "
+Manual (not self-retracting) CD trays are often found on laptops. If you are
+a laptop user, your CD burner has BurnProof technology or you experience 
+problems with mondo then please call mondorestore with this switch. 
+
+.TP
+.BI "-o "
+Use OBDR (One Button Disaster Recovery) type of tapes.
+By default, tapes are not bootable. With this flag, tape will be read as bootable tapes
+following the OBDR format.
+
+.TP
+.BI "-x " "'dev ...'"
+Specify non-Linux partitions which you want to restore (future dev).
+
+.TP
+.BI "-T " "path"
+Specify the full pathname of the tempdir, the directory where temporary files 
+are stored. 
+
+.TP
+.BI "-b "
+Specify the internal block size used by the tape drive. This is usually 32K but
+some drives just don't like that. They should but they don't. That's what
+happens when tape drive vendors don't talk to kernel driver writers. Try 512 or
+16384.
+
+.TP
+.BI "-e "
+Don't eject the CD or tape when restoring... 
+
+.TP
+.BI "-f " "device"
+Specify the drive on which your Master Boot Record lives. Usually, this is
+discovered automatically. (future dev)
+
+.TP
+.BI "-Q "
+Give more detailed information about the boot loader.
+
+.TP
 .BI "-K " "loglevel"
 Specify the loglevel. Use 99 for full debug. Standard debug level is 4.
+
+.TP
+.BI "-z "
+Use extended attributes and acl for each file and store them in the backup media. Use this option if you use SElinux e.g. but it will slow down backup and restore time of course.
 
 .SH DIAGNOSTICS

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

@@ -60 +60 @@
 extern FILE *g_tape_stream;
 extern long long g_tape_posK;
+extern bool g_cd_recovery;
 extern char *g_mondo_home;
 extern char *g_tmpfs_mountpt;
-extern bool g_cd_recovery;
 extern char *g_serial_string;
-
 extern char *g_getfacl;
 extern char *g_getfattr;
@@ -101 +100 @@
 static int g_sem_id;
 static int g_sem_key;
-
-
-
 
 /**

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

@@ -199 +199 @@
 /* Reference to global bkpinfo */
 extern struct s_bkpinfo *bkpinfo;
+
+extern void free_MR_global_filenames(void);
 
 /**
@@ -349 +351 @@
     bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
 
-/* compulsory */
+    /* compulsory */
     i = flag_set['c'] + flag_set['i'] + flag_set['n'] +
         flag_set['t'] + flag_set['u'] + flag_set['r'] +
         flag_set['w'] + flag_set['C'] + flag_set['U'];
-    if (i == 0) {
+    if ((i == 0) && (! bkpinfo->restore_data)) {
         retval++;
         log_to_screen("You must specify the media type\n");
@@ -361 +363 @@
         log_to_screen("Please specify only one media type\n");
     }
+
     if (flag_set['K']) {
         g_loglevel = atoi(flag_val['K']);
@@ -368 +371 @@
         }
     }
-    if (flag_set['L'] && flag_set['0']) {
+
+    if ((flag_set['L'] && flag_set['0']) && (! bkpinfo->restore_data)) {
         retval++;
         log_to_screen("You cannot have 'no compression' _and_ LZOP.\n");
     }
-    bkpinfo->backup_data = flag_set['O'];
+    if (! bkpinfo->restore_data) {
+        bkpinfo->backup_data = flag_set['O'];
+    }
     bkpinfo->verify_data = flag_set['V'];
+
     if (flag_set['I'] && !bkpinfo->backup_data) {
         log_to_screen("-I switch is ignored if just verifying");
@@ -401 +408 @@
         }
     }
-    if (flag_set['W']) {
+
+    if ((flag_set['W']) && (! bkpinfo->restore_data)) {
         bkpinfo->nonbootable_backup = TRUE;
         log_to_screen("Warning - you have opted for non-bootable backup");
@@ -409 +417 @@
         }
     }
-    if (flag_set['t'] && flag_set['H']) {
+
+    if ((flag_set['t'] && flag_set['H']) && (! bkpinfo->restore_data)) {
         fatal_error
             ("Sorry, you may not nuke w/o warning from tape. Drop -H, please.");
     }
+
     if (flag_set['I']) {
         if (!strcmp(bkpinfo->include_paths, "/")) {
@@ -430 +440 @@
             if (q != NULL) {
                 *q = '\0';
-                if (stat(p, &buf) != 0) {
+                if ((stat(p, &buf) != 0) && (! bkpinfo->restore_data)) {
                     log_msg(1, "ERROR ! %s doesn't exist", p);
                     fatal_error("ERROR ! You specified a directory to include which doesn't exist");
@@ -436 +446 @@
                 p = q+1 ;
             } else {
-                if (stat(p, &buf) != 0) {
+                if ((stat(p, &buf) != 0) && (! bkpinfo->restore_data)) {
                     log_msg(1, "ERROR ! %s doesn't exist", p);
                     fatal_error("ERROR ! You specified a directory to include which doesn't exist");
@@ -456 +466 @@
 
     if (g_kernel_version >= 2.6 && !flag_set['d']
-        && (flag_set['c'] || flag_set['w'])) {
+        && (flag_set['c'] || flag_set['w']) && (! bkpinfo->restore_data)) {
         fatal_error
             ("If you are using the 2.6.x kernel, please specify the CD-R(W) device.");
@@ -471 +481 @@
         strcpy(bkpinfo->include_paths, flag_val['J']);
     }
-    if (flag_set['c'] || flag_set['w'] || flag_set['C'] || flag_set['r']) {
+
+    if ((flag_set['c'] || flag_set['w'] || flag_set['C'] || flag_set['r']) && (! bkpinfo->restore_data)) {
         if (!flag_set['r'] && g_kernel_version <= 2.5
             && strstr(flag_val['d'], "/dev/")) {
@@ -522 +533 @@
         }
     }
+
     if (flag_set['t'] && !flag_set['d']) {
         log_it("Hmm! No tape drive specified. Let's see what we can do.");
@@ -540 +552 @@
         if (! flag_set['d']) {
             fatal_error
-                ("You need to specify a device file with -d for bootable USB device creation");
-        }
-        if (!flag_set['s']) {
+                ("You need to specify a device file with -d for bootable USB device usage");
+        }
+        if ((!flag_set['s']) && (! bkpinfo->restore_data)) {
             fatal_error("You did not specify a size (-s) for your USB device. Aborting");
         }
@@ -559 +571 @@
             }
         }
-        if (!find_home_of_exe("growisofs")) {
-            fatal_error
-                ("Please install growisofs (probably part of dvd+rw-tools). If you want DVD support, you need it.");
-        }
-        if (!find_home_of_exe("dvd+rw-format")) {
-            fatal_error
-                ("Please install dvd+rw-format (probably part of dvd+rw-tools). If you want DVD support, you need it.");
-        }
         if (strchr(flag_val['d'], ',')) {
             fatal_error
                 ("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
         }
-        if (!flag_set['s']) {
-            sprintf(flag_val['s'], "%d", DEFAULT_DVD_DISK_SIZE);    // 4.7 salesman's GB = 4.482 real GB = 4582 MB
-            strcat(flag_val['s'], "m");
-            log_to_screen
-                ("You did not specify a size (-s) for DVD. I'm guessing %s.",
-                 flag_val['s']);
-            flag_set['s'] = 1;
+        if (! bkpinfo->restore_data) {
+            if (!find_home_of_exe("growisofs")) {
+                fatal_error
+                    ("Please install growisofs (probably part of dvd+rw-tools). If you want DVD support, you need it.");
+            }
+            if (!find_home_of_exe("dvd+rw-format")) {
+                fatal_error
+                    ("Please install dvd+rw-format (probably part of dvd+rw-tools). If you want DVD support, you need it.");
+            }
+            if (!flag_set['s']) {
+                sprintf(flag_val['s'], "%d", DEFAULT_DVD_DISK_SIZE);    // 4.7 salesman's GB = 4.482 real GB = 4582 MB
+                strcat(flag_val['s'], "m");
+                log_to_screen
+                    ("You did not specify a size (-s) for DVD. I'm guessing %s.",
+                    flag_val['s']);
+                flag_set['s'] = 1;
+            }
         }
 /*
@@ -591 +605 @@
                 ("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
         }
-        if (flag_set['O']) {
+        if ((flag_set['O']) && (! bkpinfo->restore_data)) {
             if (flag_set['s']) {
                 if (flag_set['t']) {
@@ -609 +623 @@
             }
         }
-    } else {                    /* CD|USB size */
+    } else if (! bkpinfo->restore_data) {           /* CD|USB size */
         if (flag_set['s']) {
             if (process_the_s_switch(flag_val['s'])) {
@@ -619 +633 @@
         }                       /* CD-RW */
     }
+
     if (flag_set['n']) {
         strncpy(bkpinfo->nfs_mount, flag_val['n'], MAX_STR_LEN);
@@ -636 +651 @@
         log_msg(3, "isodir= %s", bkpinfo->isodir);
     }
+
     if (flag_set['c']) {
         bkpinfo->backup_media_type = cdr;
@@ -702 +718 @@
                 q++;
                 /* End of bug fix */
-                if (stat(p, &buf) != 0) {
+                if ((stat(p, &buf) != 0) && (! bkpinfo->restore_data)) {
                     log_msg(1, "WARNING ! %s doesn't exist", p);
                 }
                 p = q+1 ;
             } else {
-                if (stat(p, &buf) != 0) {
+                if ((stat(p, &buf) != 0) && (! bkpinfo->restore_data)) {
                     log_msg(1, "WARNING ! %s doesn't exist", p);
                 }
@@ -719 +735 @@
                 4*MAX_STR_LEN - strlen(bkpinfo->exclude_paths));
     }
+
     if (flag_set['e']) {
         bkpinfo->please_dont_eject = TRUE;
     }
-    if (flag_set['N'])          // exclude NFS mounts & devices
+
+    if ((flag_set['N']) && (! bkpinfo->restore_data))       // exclude NFS mounts & devices
     {
 //      strncpy(psz, list_of_NFS_devices_and_mounts(), MAX_STR_LEN);
@@ -733 +751 @@
                 bkpinfo->exclude_paths);
     }
+
     if (strlen(bkpinfo->exclude_paths) >= 4*MAX_STR_LEN) {
         fatal_error
             ("Your '-E' parameter is too long. Increase MAX_STR_LEN");
     }
+
     if (flag_set['b']) {
         strcpy(psz, flag_val['b']);
@@ -754 +774 @@
         bkpinfo->internal_tape_block_size = itbs;
     }
-    if (flag_set['D']) {
+
+    if ((flag_set['D']) && (! bkpinfo->restore_data)) {
         bkpinfo->differential = 1;
 //      bkpinfo->differential = atoi (flag_val['D']);
@@ -762 +783 @@
         }
     }
+
     if (flag_set['x']) {
         strncpy(bkpinfo->image_devs, flag_val['x'], MAX_STR_LEN / 4);
-        if (run_program_and_log_output("which ntfsclone", 2)) {
+        if ((run_program_and_log_output("which ntfsclone", 2)) && (! bkpinfo->restore_data)) {
             fatal_error("Please install ntfsprogs package/tarball.");
         }
     }
+
     if (flag_set['m']) {
         bkpinfo->manual_cd_tray = TRUE;
     }
-    if (flag_set['k']) {
+
+    if ((flag_set['k']) && (! bkpinfo->restore_data)) {
         strncpy(bkpinfo->kernel_path, flag_val['k'], MAX_STR_LEN);
         if (!strcmp(bkpinfo->kernel_path, "failsafe")) {
@@ -785 +809 @@
         }
     }
+
     if (flag_set['p']) {
         strncpy(bkpinfo->prefix, flag_val['p'], MAX_STR_LEN / 4);
         log_msg(1,"Prefix forced to %s",bkpinfo->prefix);
     }
-
 
     if (flag_set['d']) {        /* backup directory (if ISO/NFS) */
@@ -802 +826 @@
             strncpy(bkpinfo->nfs_remote_dir, flag_val['d'], MAX_STR_LEN);
         } else {                /* backup device (if tape/CD-R/CD-RW) */
-
             strncpy(bkpinfo->media_device, flag_val['d'], MAX_STR_LEN / 4);
         }
     }
 
-    if (flag_set['n']) {
+    if ((flag_set['n']) && (! bkpinfo->restore_data)) {
         asprintf(&tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->nfs_remote_dir);
         sprintf(tmp, "echo hi > %s", tmp1);
@@ -840 +863 @@
     }
 
-    if (!flag_set['d'] && !flag_set['n'] && !flag_set['C']) {
+    if ((!flag_set['d'] && !flag_set['n'] && !flag_set['C']) && (! bkpinfo->restore_data)) {
         retval++;
         log_to_screen("Please specify the backup device/directory.\n");
@@ -846 +869 @@
             ("You didn't use -d to specify the backup device/directory.");
     }
-/* optional, obscure */
+
     for (i = '0'; i <= '9'; i++) {
         if (flag_set[i]) {
@@ -852 +875 @@
         }                       /* not '\0' but '0' */
     }
+
     if (flag_set['S']) {
         sprintf(bkpinfo->scratchdir, "%s/mondo.scratch.%ld", flag_val['S'],
                 random() % 32768);
     }
+
     if (flag_set['T']) {
         setup_tmpdir(flag_val['T']);
@@ -873 +898 @@
         }
     }
-    if (flag_set['A']) {
+
+    if ((flag_set['A']) && (! bkpinfo->restore_data)) {
         strncpy(bkpinfo->call_after_iso, flag_val['A'], MAX_STR_LEN);
     }
-    if (flag_set['B']) {
+
+    if ((flag_set['B']) && (! bkpinfo->restore_data)) {
         strncpy(bkpinfo->call_before_iso, flag_val['B'], MAX_STR_LEN);
     }
-    if (flag_set['H']) {
+
+    if ((flag_set['H']) && (! bkpinfo->restore_data)) {
         g_cd_recovery = TRUE;
     }
-    if (flag_set['l']) {
+
+    if ((flag_set['l']) && (! bkpinfo->restore_data)) {
 #ifdef __FreeBSD__
 #  define BOOT_LOADER_CHARS "GLBMR"
@@ -902 +931 @@
 #undef BOOT_LOADER_CHARS
     }
+
     if (flag_set['f']) {
         strncpy(bkpinfo->boot_device,
@@ -908 +938 @@
                 MAX_STR_LEN / 4);
     }
-    if (flag_set['P']) {
+
+    if ((flag_set['P']) && (! bkpinfo->restore_data)) {
         strncpy(bkpinfo->postnuke_tarball, flag_val['P'], MAX_STR_LEN);
     }
+
     if (flag_set['Q']) {
         i = which_boot_loader(tmp);
@@ -917 +949 @@
         finish(0);
     }
-    if (flag_set['L']) {
+
+    if ((flag_set['L']) && (! bkpinfo->restore_data)) {
         bkpinfo->use_lzo = TRUE;
         if (run_program_and_log_output("which lzop", 2)) {
@@ -926 +959 @@
     }
 
-    if (flag_set['G']) {
+    if ((flag_set['G']) && (! bkpinfo->restore_data)) {
         bkpinfo->use_gzip = TRUE;
         if (run_program_and_log_output("which gzip", 2)) {
@@ -937 +970 @@
     bkpinfo->use_obdr = FALSE;
     if (flag_set['o']) {
-        if (!flag_set['t']) {
+        if ((!flag_set['t']) && (! bkpinfo->restore_data)) {
             log_to_screen("OBDR support is only available for tapes. Use the -t option");
             fatal_error("Aborting");
@@ -943 +976 @@
         bkpinfo->use_obdr = TRUE;
     }
+
 #ifndef __FreeBSD__
-    if (!is_this_a_valid_disk_format("vfat")) {
+    if ((!is_this_a_valid_disk_format("vfat")) && (! bkpinfo->restore_data)) {
         bkpinfo->make_cd_use_lilo = TRUE;
         log_to_screen
@@ -951 +985 @@
             ("using LILO instead of SYSLINUX as the media boot loader.");
     }
-    if (run_program_and_log_output("which mkfs.vfat", 2)) {
+    if ((run_program_and_log_output("which mkfs.vfat", 2)) && (! bkpinfo->restore_data)) {
         bkpinfo->make_cd_use_lilo = TRUE;
 #ifdef __IA32__
@@ -976 +1010 @@
     }
 
-    if ( ! bkpinfo->restore_data ) {
+    if (! bkpinfo->restore_data) {
         i = flag_set['O'] + flag_set['V'];
         if (i == 0) {
             retval++;
             log_to_screen("Specify backup (-O), verify (-V) or both (-OV).\n");
+        }
+    }
+
+    if ((! bkpinfo->restore_data) && (flag_set['Z'])) {
+            fatal_error
+                ("The -Z switch is only valid in restore mode");
+    }
+
+    if (flag_set['Z']) {
+        if (! strcmp(flag_val['Z'], "nuke")) {
+            bkpinfo->restore_mode = nuke;
+        } else if (! strcmp(flag_val['Z'], "interactive")) {
+            bkpinfo->restore_mode = interactive;
+        } else if (! strcmp(flag_val['Z'], "compare")) {
+            bkpinfo->restore_mode = compare;
+        } else if (! strcmp(flag_val['Z'], "mbr")) {
+            bkpinfo->restore_mode = mbr;
+        } else if (! strcmp(flag_val['Z'], "iso")) {
+            bkpinfo->restore_mode = isoonly;
+        } else if (! strcmp(flag_val['Z'], "isonuke")) {
+            bkpinfo->restore_mode = isonuke;
+        } else {
+            bkpinfo->restore_mode = interactive;
         }
     }
@@ -1078 +1135 @@
 void help_screen()
 {
-    log_msg(1, "Type 'man mondo-archive' for more information\n");
+    log_msg(1, "Type 'man mondoarchive' for more information\n");
     exit(1);
 }
@@ -1137 +1194 @@
     }
     kill_buffer();
+
+    free_MR_global_filenames();
+
     fatal_error
-        ("Mondoarchive is terminating in response to a signal from the OS");
+        ("MondoRescue is terminating in response to a signal from the OS");
     finish(254);                // just in case
 }

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

@@ -1767 +1767 @@
         snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s . .. \
 " MNT_CDROM " " MNT_FLOPPY " /media /tmp \
-/proc /sys /root/images/mondo " MINDI_CACHE, MONDO_CACHE, excp, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+/proc /sys /var/cache/mondo " MINDI_CACHE, MONDO_CACHE, excp, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
         paranoid_free(tmp2);
 

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

@@ -806 +806 @@
 
 void setup_tmpdir(char *path) {
-    
+
     char *tmp = NULL;
     char *p = NULL;
@@ -816 +816 @@
         paranoid_free(tmp);
     }
-        
+
     if (path != NULL) {
         asprintf(&tmp, "%s/mondo.tmp.XXXXXX", path);
@@ -871 +871 @@
         strcpy(bkpinfo->isodir, "/");
     } else {
-        strcpy(bkpinfo->isodir, "/root/images/mondo");
+        strcpy(bkpinfo->isodir, "/var/cache/mondo");
     }
     strcpy(bkpinfo->prefix, STD_PREFIX);
@@ -898 +898 @@
     bkpinfo->make_cd_use_lilo = FALSE;
     bkpinfo->use_obdr = FALSE;
+    bkpinfo->restore_mode = interactive;
 }
 

branches/2.2.6/mondo/src/common/mondostructures.h

@@ -151 +151 @@
    */
     int index;
-    
+
   /**
    * Type of disk.
    */
     char type;  // ' ' = data (default), S = spare, F = faulty
-    
+
 };
 
@@ -197 +197 @@
 } t_archtype;
 
+/**
+ * A type of file in the catalog of recent archives.
+ */
+typedef enum {
+    nuke = 0,                   /// Nuke mode
+    interactive,                /// Interactive mode
+    compare,                    /// Compare mode
+    mbr,                        /// MBR mode
+    isoonly,                    /// ISO mode
+    isonuke,                    /// ISO+Nuke mode
+} t_restore_mode;
+
 
 #ifdef __FreeBSD__
@@ -249 +261 @@
        */
     int chunk_size;
-    
+
       /**
        * The parity algorithm of this RAID device. (RAID5 only)
@@ -571 +583 @@
     bool wipe_media_first;
 
-// patch by Herman Kuster  
+// patch by Herman Kuster
   /**
    * The differential level of this backup. Currently only 0 (full backup) and 1
@@ -577 +589 @@
    */
     int differential;
-// end patch  
+// end patch
 
   /**
@@ -611 +623 @@
    */
     bool use_obdr;
+
+  /**
+   * Nature of the restore
+   */
+    t_restore_mode restore_mode;
 };
 

branches/2.2.6/mondo/src/mondoarchive/mondoarchive.c

@@ -72 +72 @@
 struct s_bkpinfo *bkpinfo;
 
+/* To be coded */
+void free_MR_global_filenames(void) {
+}
+
 /****************** subroutines used only by main.c ******************/
 

branches/2.2.6/mondo/src/mondoarchive/mondoarchive.h

@@ -9 +9 @@
  */
 char *MONDO_LOGFILE = "/var/log/mondoarchive.log";
-char *MONDO_OPTIONS = "0123456789A:B:C:DE:FGHI:J:K:LNOP:QRS:T:UVWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z";
+char *MONDO_OPTIONS = "0123456789A:B:C:DE:GHI:J:K:LNOP:QRS:T:UVWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z";
 
 /* No restriction on ps options */

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