Changeset 1977 in MondoRescue

Timestamp:

Jun 2, 2008, 10:49:01 AM (17 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 1938:1976 $SVN_M/branches/2.2.6

Location:

branches/stable

Files:

• mindi-kernel/TAG (deleted)
• mindi-kernel/VERSION (deleted)
• mindi-kernel/distributions (deleted)
• mindi-kernel/mindi-kernel.spec (modified) (1 diff)
• mindi/README.pxe (modified) (2 diffs)
• mindi/TAG (deleted)
• mindi/VERSION (deleted)
• mindi/analyze-my-lvm (modified) (1 diff)
• mindi/distributions/conf/mindi.conf.dist (modified) (1 diff)
• mindi/mindi (modified) (6 diffs)
• mindi/rootfs/dev/dev-entries.tgz (modified) ( previous)
• mindi/rootfs/sbin/init (modified) (7 diffs)
• mindi/rootfs/sbin/post-init (modified) (4 diffs)
• mondo-doc/TAG (deleted)
• mondo-doc/VERSION (deleted)
• mondo-doc/mondoarchive.8 (modified) (3 diffs)
• mondo-doc/mondorestore.8 (modified) (2 diffs)
• mondo/TAG (deleted)
• mondo/VERSION (deleted)
• mondo/src/common/libmondo-archive.c (modified) (9 diffs)
• mondo/src/common/libmondo-cli.c (modified) (35 diffs)
• mondo/src/common/libmondo-devices.c (modified) (4 diffs)
• mondo/src/common/libmondo-filelist.c (modified) (1 diff)
• mondo/src/common/libmondo-stream-EXT.h (modified) (1 diff)
• mondo/src/common/libmondo-stream.c (modified) (10 diffs)
• mondo/src/common/libmondo-stream.h (modified) (1 diff)
• mondo/src/common/libmondo-tools.c (modified) (4 diffs)
• mondo/src/common/mondostructures.h (modified) (4 diffs)
• mondo/src/mondoarchive/mondoarchive.c (modified) (1 diff)
• mondo/src/mondoarchive/mondoarchive.h (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (8 diffs)
• mondo/src/mondorestore/mondorestore.c (modified) (11 diffs)
• mondo/src/mondorestore/mondorestore.h (modified) (1 diff)

branches/stable/mindi-kernel/mindi-kernel.spec

@@ -2 +2 @@
 # $Id$
 #
-%define mrel    1
 
 Summary:    A program that creates emergency boot disks/CDs using your kernel, tools and modules.
 Name:       mindi-kernel
-Version:    1.06
-Release:    %mrel
+Version:    2.6
+Release:    1
 License:    GPL
 Group:      System/Kernel and hardware

branches/stable/mindi/README.pxe

@@ -21 +21 @@
 server is the ip addr of the NFS server
 mountpoint is the mount point on the NFS server to use (should be in /etc/exports of the NFS server)
+rmadisk_size may have to be increase to 131072 on more recent distributions such as rhel 5
 The [] mean this parameter is optional
 The () mean that you have a choice with the '|' meaning 'or'
@@ -40 +41 @@
 During boot mondorestore will start your NFS configuration and mount mondo's content from the network rather than from a physical media. You may alter the IP configuration stored from the original machine by passing the ipconf option describing respectively the IP address, netmask, broadcast and default gateway you want to setup for the machine, separated by ':'. Or alternatively, you may specify the dhcp keyword so that a DHCP request is made to get those information. In the 2 cases, you have to mention on which physical interface those parameters should apply. On some configurations, you may also want to increase the number of ping queries made before the NFS mount, which is of 3 by default, using the ping option and give the number you want. If you have a different NFS server for the deployment than for the archiving, you can also precise it through the nfsmount option. The structure on both server under the mountpoint has to be the same.
 
+CAVEAT: the limit to the number of char on the append line is 255. Use symlinks to reduce the size of your path if needed.
+
 Please report any problem around that tool to bruno@mondorescue.org
 

branches/stable/mindi/analyze-my-lvm

@@ -13 +13 @@
 GetValueFromField() {
     local res
-    sed s/'    '/~/ "$1" | tr -s ' ' ' ' | sed s/'~ '/'~'/ | grep -i "$2~" | cut -d'~' -f2,3,4,5 | tr '~' ' ' | gawk '{ if ($2=="MB") {printf "%dm",$1;} else if ($2=="KB") {printf "%dk",$1;} else if ($2=="GB") {printf "%dg",$1;} else {print $0;};}'
+    sed s/'    '/~/ "$1" | tr -s ' ' ' ' | sed s/'~ '/'~'/ | grep -i "$2~" | cut -d'~' -f2,3,4,5 | tr '~' ' ' | gawk '{ if ($2=="MB") {printf "%dm",$1;} else if ($2=="KB") {printf "%dk",$1;} else if ($2=="GB") {printf "%fg",$1;} else {print $0;};}'
 }
 

branches/stable/mindi/distributions/conf/mindi.conf.dist

@@ -92 +92 @@
 # Modules supported by mindi and required at boot time 
 #
-mindi_scsi_mods="3w-xxxx 3w_xxxx 3w-9xxx 3w_9xxx 53c7,8xx a100u2w a320raid aacraid adpahci advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc dmx3191d dpt_i2o dtc eata eata_dma eata_pio fdomain gdth g_NCR5380 i2o_block i2o_core ide-scsi ieee1394 imm in2000 initio ips iscsi isp megaraid megaraid_mm megaraid_mbox megaraid_sas mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qla2xxx qla2xxx_conf qlogicfas qlogicfc qlogicisp raw1394 scsi_debug scsi_mod scsi_transport_sas scsi_transport_spi sd_mod seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs"
+mindi_scsi_mods="3w-xxxx 3w_xxxx 3w-9xxx 3w_9xxx 53c7,8xx a100u2w a320raid aacraid adpahci advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc dmx3191d dpt_i2o dtc eata eata_dma eata_pio fdomain gdth g_NCR5380 i2o_block i2o_core ide-scsi ieee1394 imm in2000 initio ips iscsi isp megaraid megaraid_mm megaraid_mbox megaraid_sas mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qla2xxx qla2xxx_conf qlogicfas qlogicfc qlogicisp raw1394 scsi_debug scsi_mod scsi_transport_sas scsi_transport_spi sd_mod seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs intermodule"
 mindi_ide_mods="ide ide-generic ide-detect ide-mod ide-disk ide_disk ide-cd ide_cd ide-cs ide-core ide_core edd paride ata_generic ata_piix libata via82cxxx generic nvidia ahci sata_nv cmd64x pata_amd pata_marvell pata_serverworks"
 # Replace with that line for HP OCMP e.g.

branches/stable/mindi/mindi

@@ -1385 +1385 @@
     rm -Rf $MINDI_TMP/iso
     mkdir -p $MINDI_TMP/iso/{images,archives,isolinux}
-    cp -f $1/*.img $1/*.gz $MINDI_TMP/iso/images 2>> $LOGFILE || LogIt "OfferToMakeBootableISO: Cannot copy $i to $MINDI_TMP/iso/images"
+    cp -f $1/*.gz $MINDI_TMP/iso/images 2>> $LOGFILE || LogIt "OfferToMakeBootableISO: Cannot copy $1/*.gz to $MINDI_TMP/iso/images"
     old_pwd=`pwd`
     cd $MINDI_TMP/iso
@@ -1427 +1427 @@
     else
         $ISO_CMD $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b images/mindi-bootroot.$BOOT_SIZE.img -c isolinux/boot.cat -no-emul-boot . > /dev/null 2> $MINDI_TMP/mkisofs.log
+        rm -f images/mindi-bootroot.$BOOT_SIZE.img
     fi
     if [ "$?" -ne "0" ] ; then
@@ -1630 +1631 @@
             else
                 options="interactive expert compare iso nuke isonuke"
-# hda hdb hdc hdd"
             fi
         else
@@ -2100 +2100 @@
     rm -f $orig_file
     return 0
-}
-
-
-ScanCDandTape() {
-    local i
-
-    for i in /dev/st0 /dev/ht0 /dev/cdrom /dev/cdrom0 /dev/cdrom 1 ; do
-        dd if=$i of=/dev/null bs=64k count=1 &> /dev/null
-    done
 }
 
@@ -2880 +2871 @@
     fi
 fi
-#ScanCDandTape
 [ "$CDRECOVERY" = "yes" ] || CDRECOVERY=no
 if [ "$CDRECOVERY" = "yes" ] ; then
@@ -2956 +2946 @@
 fi
 if [ _"$MONDO_SHARE" = _"" ] && [ "$INTERACTIVE" = "yes" ] && [ "$ARCH" != "ia64" ] ; then
-    echo -en "Would you like to use LILO (instead of syslinux)\nfor your boot image (y/[n]) ?"
-    read ch
-    if [ "$ch" != "y" ] && [ "$ch" != "Y" ] ; then
-        USE_LILO=no
-    else
-        USE_LILO=yes
-    fi
+    USE_LILO=no
 fi
 if [ "$YOUR_KERNEL_SUCKS" != "" ] || [ "$kernelpath" = "" ] || [ "$kernelpath" = "SUCKS" ] || [ "$kernelpath" = "FAILSAFE" ] ; then

branches/stable/mindi/rootfs/sbin/init

@@ -105 +105 @@
     [ "$1" != "" ] && tapedev=$1
     [ ! "$tapedev" ] && tapedev=`grep media-dev /tmp/mondo-restore.cfg | tr -s ' ' ' ' | cut -d' ' -f2`
-#    tar -zxf $tapedev
+    mt -f $tapedev rewind
+    mt -f $tapedev fsf 2
     dd if=$tapedev bs=32k count=1024 | tar -zx
     res=$?
     if [ "$res" -eq "0" ] ; then
-    grep -v media-dev /tmp/mondo-restore.cfg > /tmp/mr.cfg
-    echo "media-dev=$tapedev" >> /tmp/mr.cfg
-        cp -f /tmp/mr.cfg /tmp/mondo-restore.cfg
+        # Store the dev name in case we changed it interactively
+        sed -i "s/^media-dev .*$/media-dev  $tapedev/" /tmp/mondo-restore.cfg
+
+        #grep -v media-dev /tmp/mondo-restore.cfg > /tmp/mr.cfg
+        #echo "media-dev $tapedev" >> /tmp/mr.cfg
+        #cp -f /tmp/mr.cfg /tmp/mondo-restore.cfg
     fi
     cd $old_pwd
@@ -120 +124 @@
     local res tapedev
     tapedev="" ; # will be set by UntarTapeStuff()
+
+    # Here we can add the USB storage module, it's working even with OBDR !
+    modprobe -q usb-storage
+    # Tape takes some time to appear
+    sleep 10
     cd $GROOVY
-    UntarTapeStuff $tapedev || UntarTapeStuff /dev/st0 || UntarTapeStuff /dev/osst0 || UntarTapeStuff /dev/ht0
+    UntarTapeStuff $tapedev
     res=$?
     while [ "$res" -ne "0" ] ; do
@@ -139 +148 @@
         fi
     done
+    # For post-init
+    export TAPEDEV=$tapedev
 
     if [ "$res" -ne "0" ] ; then
@@ -146 +157 @@
         res=$?
     else
-    #   clear
         LogIt "Using tape as extended datadisk. Good." 3
         echo "Using tape as extd ddisk." > /tmp/TAPEDEV-HAS-DATA-DISKS
@@ -584 +594 @@
     export DENY_MODS=" "
 fi
-
+if [ "`grep -i 'obdr ' /tmp/mondo-restore.cfg`" ]; then
+    # Do not try to load usb storage when dealing with OBDR it makes the modprobe hang :-(
+    export DENY_MODS="usb-storage $DENY_MODS"
+fi
 if [ "`grep -i forcemods /proc/cmdline`" ]; then
     export FORCE_MODS="`cat /proc/cmdline | sed 's~.*forcemods=\"\(.*\)\".*~\1~'` mondonone"
@@ -623 +636 @@
 fi
 
-if [ "`grep -i 'tape ' /tmp/mondo-restore.cfg`" ] || [ "`grep -i udev /tmp/mondo-restore.cfg`" ]; then
+if [ "`grep -i 'obdr ' /tmp/mondo-restore.cfg`" ] || [ "`grep -i ' udev' /tmp/mondo-restore.cfg`" ]; then
     HandleTape
     ExtractDataDisksAndLoadModules
@@ -635 +648 @@
     ExtractDataDisksAndLoadModules
 elif [ "`grep -i usb= /proc/cmdline`" ] || [ "`grep -i usb /tmp/mondo-restore.cfg | grep media-type`" ]; then
-    # We need to get here exported variables from start-nfs
     . /sbin/start-usb
 

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

@@ -104 +104 @@
 done
 
+mondoopt=""
+if [ "`grep -i 'obdr ' /tmp/mondo-restore.cfg`" ]; then
+    mondoopt="$mondoopt -o -d $TAPEDEV"
+fi
+
+if [ "`grep -i 'debug' /proc/cmdline`" ]; then
+    mondoopt="$mondoopt -K 99"
+fi
+
 if [ "$compare" ] ; then
     LogIt "------------------COMPARE MODE-----------------" 1
-    mondorestore --compare
+    mondorestore $mondoopt -Z compare
 elif [ "$nuke" ] ; then
     LogIt "-------------------NUKE MODE-------------------" 1
-    mondorestore --nuke
+    mondorestore $mondoopt -Z nuke
 elif [ "$expert" ] ; then
     if [ "`grep tapedev /tmp/mondo-restore.cfg`" ] ; then
@@ -119 +128 @@
         LogIt "Tape Mode -- calling mondorestore..."
             if [ "$nuke" ] ; then
-                mondorestore --nuke
+                mondorestore $mondoopt -Z nuke
             else
-                mondorestore; # MR will detect & access the tape
+                mondorestore $mondoopt; # MR will detect & access the tape
             fi
     fi
@@ -132 +141 @@
             LogIt "Cdstream Mode -- calling mondorestore..."
             if [ "$nuke" ] ; then
-                mondorestore --nuke
+                mondorestore -Z nuke $mondoopt
             else
-                mondorestore; # MR will detect & access the cdstream
+                mondorestore $mondoopt; # MR will detect & access the cdstream
             fi
         fi
@@ -147 +156 @@
 else
     LogIt "------------------INTERACTIVE------------------" 1
-    mondorestore --interactive
+    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/stable/mondo-doc/mondoarchive.8

@@ -189 +189 @@
 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
@@ -212 +212 @@
 .TP
 .BI "-o "
-Use LILO as boot loader of boot media instead of SYSLINUX/ISOLINUX. By
-default, SYSLINUX is used for USB and ISOLINUX for CD's. Use LILO if you
-prefer to use that boot loader. NB: This does not affect which boot loader you
-use to boot your PC, merely the boot loader used by the media created
-by Mondo. Use ELILO instead which is mandatory for IA64 machines.
+Use OBDR (One Button Disaster Recovery) type of tapes.
+By default, tapes are not bootable. With this flag, tape will be made bootable
+following the OBDR format.
 
 .TP
@@ -310 +308 @@
 .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/stable/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/stable/mondo/src/common/libmondo-archive.c

@@ -60 +60 @@
 /*@unused@*/
 //static char cvsid[] = "$Id$";
+//
+extern char *get_non_rewind_dev(char *);
 
 /* *************************** external global vars ******************/
@@ -70 +72 @@
 extern long long g_tape_posK;
 extern char *g_tmpfs_mountpt;
-extern bool g_cd_recovery;
 extern char *g_serial_string;
-
 extern char *g_getfacl;
 extern char *g_getfattr;
@@ -79 +79 @@
 /* Reference to global bkpinfo */
 extern struct s_bkpinfo *bkpinfo;
-
 
 
@@ -111 +110 @@
 static int g_sem_id;
 static int g_sem_key;
-
-
-
 
 /**
@@ -540 +536 @@
     char *use_lilo_sz = NULL;
     char *bootdev = NULL;
+    char *ntapedev = NULL;
 
     /*@ char ************************************************************** */
@@ -586 +583 @@
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         mr_asprintf(&tape_size_sz, "%ld", bkpinfo->media_size);
+        ntapedev = get_non_rewind_dev(bkpinfo->media_device);
+        if ((bkpinfo->use_obdr) && (ntapedev != NULL)) {
+            mr_free(bkpinfo->media_device);
+            bkpinfo->media_device = ntapedev;
+        } else {
+            if (ntapedev == NULL) {
+                log_it("Not able to create OBDR - Restore will have to be done manually");
+            }
+        }
         mr_asprintf(&tape_device, bkpinfo->media_device);
     } else {
@@ -858 +864 @@
         mr_fprintf(fd1, "acl=no\n");
     }
+    if (bkpinfo->use_obdr) {
+        asprintf(&tmp1, "%s/OBDR", bkpinfo->tmpdir);
+        if (write_one_liner_data_file(tmp1, "TRUE")) {
+            log_msg(1, "%ld: Unable to write one-liner OBDR",
+                __LINE__);
+        }
+        paranoid_free(tmp1);
+    }
 
     if (g_cd_recovery) {
@@ -1255 +1269 @@
             openout_cdstream(bkpinfo->media_device, bkpinfo->writer_speed);
         } else {
-            openout_tape(bkpinfo->media_device, bkpinfo->internal_tape_block_size); /* sets g_tape_stream */
+            openout_tape(); /* sets g_tape_stream */
         }
         if (!g_tape_stream) {
@@ -2144 +2158 @@
         /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
         if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-            register_in_tape_catalog(fileset, curr_set_no, -1,
-                                     curr_afioball_fname);
-            maintain_collection_of_recent_archives(bkpinfo->tmpdir,
-                                                   curr_afioball_fname);
+            register_in_tape_catalog(fileset, curr_set_no, -1, curr_afioball_fname);
+            maintain_collection_of_recent_archives(bkpinfo->tmpdir, curr_afioball_fname);
             iamhere("Writing EXAT files");
             res +=

branches/stable/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']);
-            log_msg(1,"Loglevel forced to %s",g_loglevel);
+            log_msg(1,"Loglevel forced to %d",g_loglevel);
         if (g_loglevel < 3) {
             g_loglevel = 3;
         }
     }
-    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']) {
+
+    if ((flag_set['t'] && !flag_set['d']) && (! bkpinfo->restore_data)) {
         log_it("Hmm! No tape drive specified. Let's see what we can do.");
         if (find_tape_device_and_size(flag_val['d'], tmp)) {
@@ -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) */
@@ -801 +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);
@@ -839 +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");
@@ -845 +869 @@
             ("You didn't use -d to specify the backup device/directory.");
     }
-/* optional, obscure */
+
     for (i = '0'; i <= '9'; i++) {
         if (flag_set[i]) {
@@ -851 +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']);
@@ -872 +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"
@@ -901 +931 @@
 #undef BOOT_LOADER_CHARS
     }
+
     if (flag_set['f']) {
         strncpy(bkpinfo->boot_device,
@@ -907 +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);
@@ -916 +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)) {
@@ -925 +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)) {
@@ -934 +968 @@
     }
 
-    if (!flag_set['o']
-        &&
-        !run_program_and_log_output
-        ("grep -Ei suse /etc/issue.net | grep -E '9.0' | grep 64", 2)) {
+    bkpinfo->use_obdr = FALSE;
+    if (flag_set['o']) {
+        if ((!flag_set['t']) && (! bkpinfo->restore_data)) {
+            log_to_screen("OBDR support is only available for tapes. Use the -t option");
+            fatal_error("Aborting");
+        }
+        bkpinfo->use_obdr = TRUE;
+    }
+
+#ifndef __FreeBSD__
+    if ((!is_this_a_valid_disk_format("vfat")) && (! bkpinfo->restore_data)) {
         bkpinfo->make_cd_use_lilo = TRUE;
         log_to_screen
-            ("Forcing you to use LILO. SuSE 9.0 (64-bit) has a broken mkfs.vfat binary.");
-    }
-    if (flag_set['o']) {
+            ("Your kernel appears not to support vfat filesystems. I am therefore");
+        log_to_screen
+            ("using LILO instead of SYSLINUX as the media boot loader.");
+    }
+    if ((run_program_and_log_output("which mkfs.vfat", 2)) && (! bkpinfo->restore_data)) {
         bkpinfo->make_cd_use_lilo = TRUE;
-    }
-#ifndef __FreeBSD__
-    else {
-        if (!is_this_a_valid_disk_format("vfat")) {
-            bkpinfo->make_cd_use_lilo = TRUE;
-            log_to_screen
-                ("Your kernel appears not to support vfat filesystems. I am therefore");
-            log_to_screen
-                ("using LILO instead of SYSLINUX as the media boot loader.");
-        }
-        if (run_program_and_log_output("which mkfs.vfat", 2)) {
-            bkpinfo->make_cd_use_lilo = TRUE;
 #ifdef __IA32__
-            log_to_screen
-                ("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
-            log_to_screen
-                ("your boot loader. I shall therefore use LILO instead.");
+        log_to_screen
+            ("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
+        log_to_screen
+            ("your boot loader. I shall therefore use LILO instead.");
 #endif
 #ifdef __IA64__
-            log_to_screen
-                ("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
-            log_to_screen("environment correctly. Please install it.");
-            fatal_error("Aborting");
+        log_to_screen
+            ("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
+        log_to_screen("environment correctly. Please install it.");
+        fatal_error("Aborting");
 #endif
-        }
+    }
 #ifdef __IA64__
-        /* We force ELILO usage on IA64 */
-        bkpinfo->make_cd_use_lilo = TRUE;
+    /* We force ELILO usage on IA64 */
+    bkpinfo->make_cd_use_lilo = TRUE;
 #endif
-    }
 #endif
 
@@ -980 +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;
         }
     }
@@ -1082 +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);
 }
@@ -1141 +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/stable/mondo/src/common/libmondo-devices.c

@@ -1749 +1749 @@
 
     case tape:
-        if (bkpinfo->media_device) {
+        if ((!bkpinfo->restore_mode) && (find_tape_device_and_size(bkpinfo->media_device, sz_size))) {
+            mr_msg(3, "Ok, using vanilla scsi tape.");
+            mr_free(bkpinfo->media_device);
+            mr_asprintf(&tmp,VANILLA_SCSI_TAPE);
+            bkpinfo->media_device = tmp;
+
             if ((fin = fopen(bkpinfo->media_device, "r"))) {
                 paranoid_fclose(fin);
@@ -1795 +1800 @@
         bkpinfo->media_size = 0L;
         mr_msg(4, "media_size = %ld", bkpinfo->media_size);
+        bkpinfo->use_obdr = ask_me_yes_or_no
+            ("Do you want to activate OBDR support for your tapes ?");
         if (archiving_to_media) {
             if ((bkpinfo->compression_level =
@@ -2196 +2203 @@
     strcpy(exclude_these_directories,
            call_program_and_get_last_line_of_output
-           ("mount -t coda,ncpfs,nfs,smbfs,cifs,afs,ocfs,ocfs2,mvfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
+           ("mount -t coda,ncpfs,nfs,smbfs,cifs,afs,gfs,ocfs,ocfs2,mvfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
     strcpy(exclude_these_devices,
            call_program_and_get_last_line_of_output
-           ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|afs|ocfs|ocfs2|mvfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
+           ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|afs|gfs|ocfs|ocfs2|mvfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
     sprintf(result_sz, "%s", exclude_these_directories);
     mr_free(exclude_these_devices);
@@ -2227 +2234 @@
     mr_asprintf(&tmp,
            call_program_and_get_last_line_of_output
-           ("LANGUAGE=C df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs,afs,ocfs,ocfs2,mvfs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
+           ("LANGUAGE=C df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs,afs,gfs,ocfs,ocfs2,mvfs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #else
     mr_asprintf(&tmp,
            call_program_and_get_last_line_of_output
-           ("LANGUAGE=C df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs -x afs -x ocfs -x ocfs2 -x mvfs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
+           ("LANGUAGE=C df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs -x afs -x gfs -x ocfs -x ocfs2 -x mvfs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #endif
 

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

@@ -1603 +1603 @@
         mr_asprintf(&exclude_paths, " %s %s %s %s %s %s . .. \
 " MNT_CDROM " " MNT_FLOPPY " /media /tmp /var/log/lastlog \
-/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);
-        paranoid_free(tmp2);
+/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);
+        mr_free(tmp2);
 
         mr_msg(2,

branches/stable/mondo/src/common/libmondo-stream-EXT.h

@@ -13 +13 @@
 extern int openin_tape();
 extern int openout_cdstream(char *cddev, int speed);
-extern int openout_tape(char *tapedev, long internal_tape_block_size);
+extern int openout_tape();
 extern int read_file_from_stream_to_file(
                                          char *outfile, long long size);

branches/stable/mondo/src/common/libmondo-stream.c

@@ -2 +2 @@
 
 ...tools for talking to tapes, Monitas streams, etc.
+
 */
 
@@ -364 +365 @@
     int res = 0;
     char *fname = (char *)&res;                 /* Should NOT be NULL */
+    char *tmp = NULL;
 
     // xattr
@@ -371 +373 @@
             wrong_marker(BLK_START_EXAT_FILE, *pctrl_chr);
         }
-        if (!strstr(fname, "xattr")) {
-            fatal_error("Wrong order for xattr, sunshine.");
+        if (strstr(fname, "xattr") == NULL) {
+            asprintf(&tmp,"Wrong order expected xattr, got %s, sunshine.", fname);
+            fatal_error(tmp);
         }
         read_file_from_stream_to_file(xattr_fname, *ptmp_size);
-        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
+        res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
         if (*pctrl_chr != BLK_STOP_EXAT_FILE) {
             wrong_marker(BLK_STOP_EXAT_FILE, *pctrl_chr);
         }
         mr_msg(1, "Got xattr");
-        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
+        res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
         if (*pctrl_chr != BLK_STOP_EXTENDED_ATTRIBUTES) {
             wrong_marker(BLK_STOP_EXTENDED_ATTRIBUTES, *pctrl_chr);
         }
-        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
-        if (pctrl_chr == BLK_START_AN_AFIO_OR_SLICE) {
+        res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
+        if (*pctrl_chr == BLK_START_AN_AFIO_OR_SLICE) {
             log_msg(1, "No acl attributes found, skipping to afio files");
             return(0);
         } else {
-            if (pctrl_chr != BLK_START_EXTENDED_ATTRIBUTES) {
+            if (*pctrl_chr != BLK_START_EXTENDED_ATTRIBUTES) {
                 wrong_marker(BLK_START_EXTENDED_ATTRIBUTES, *pctrl_chr);
             }
@@ -397 +400 @@
     if (g_getfacl) {
         res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
-        if (!strstr(fname, "acl")) {
-            fatal_error("Wrong order for acl, sunshine.");
-        }
         if (*pctrl_chr != BLK_START_EXAT_FILE) {
             wrong_marker(BLK_START_EXAT_FILE, *pctrl_chr);
         }
+        if (strstr(fname, "acl") == NULL) {
+            asprintf(&tmp,"Wrong order expected acl, got %s, sunshine.", fname);
+            fatal_error(tmp);
+        }
         read_file_from_stream_to_file(acl_fname, *ptmp_size);
-        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
+        res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
         if (*pctrl_chr != BLK_STOP_EXAT_FILE) {
             wrong_marker(BLK_STOP_EXAT_FILE, *pctrl_chr);
         }
-        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
+        res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
         if (*pctrl_chr != BLK_STOP_EXTENDED_ATTRIBUTES) {
             wrong_marker(BLK_STOP_EXTENDED_ATTRIBUTES, *pctrl_chr);
@@ -595 +599 @@
 
 
-int set_tape_block_size_with_mt(char *tapedev,
-                                long internal_tape_block_size)
+int set_tape_block_size_with_mt(long internal_tape_block_size)
 {
     char *tmp;
     int res;
 
-    if (strncmp(tapedev, "/dev/", 5)) {
+    if (strncmp(bkpinfo->media_device, "/dev/", 5)) {
         mr_msg(1,
                 "Not using 'mt setblk'. This isn't an actual /dev entry.");
         return (0);
     }
-    mr_asprintf(&tmp, "mt -f %s setblk %ld", tapedev,
-             internal_tape_block_size);
+    mr_asprintf(&tmp, "mt -f %s setblk %ld",bkpinfo->media_device,internal_tape_block_size);
     res = run_program_and_log_output(tmp, 3);
     mr_free(tmp);
     return (res);
+}
+
+/**
+ * Return the non-rewinding device when passed the normal one
+ * @param tapedev The tape device to open for writing.
+ * @note the caller needs to free the string returned
+ */
+char *get_non_rewind_dev(char *tapedev)
+{
+
+    char *ntapedev = NULL;
+    char *p = NULL;
+    char *q = NULL;
+    char *r = NULL;
+
+    ntapedev = (char *)malloc(strlen(tapedev)+sizeof(char));
+    p = strrchr(tapedev,'/');
+    if (p == NULL) {
+        log_it("Didn't find a '/' in %s",tapedev);
+        return(NULL);
+    }
+
+    /* Copy tapedev content up to the last / */
+    q = tapedev;
+    r = ntapedev;
+    while (q != p) {
+        *r = *q;
+        r++;
+        q++;
+    }
+    /* Copy the '/' */
+    *r = *q;
+    r++;
+    q++;
+    /* Adds a 'n' - non-rewinding */
+    *r = 'n';
+    r++;
+    /* Copy the rest of tapedev */
+    while (*q != '\0') {
+        *r = *q;
+        r++;
+        q++;
+    }
+    *r = '\0';
+    if (mt_says_tape_exists(ntapedev)) {
+        log_it("Non-rewinding tape device is %s",ntapedev);
+    } else {
+        log_it("Unable to find non-rewinding tape device.");
+        ntapedev = NULL;
+    }
+    return(ntapedev);
+}
+
+
+
+/**
+ * Handle OBDR if we were asked to do so
+ * @param tapedev The tape device to open for reading.
+ */
+int skip_obdr(void)
+{
+    char *command = NULL;
+    int res = 0;
+
+    log_it("Skipping OBDR headers");
+    asprintf(&command, "mt -f %s rewind",bkpinfo->media_device);
+    res = run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
+    asprintf(&command, "mt -f %s fsf 2",bkpinfo->media_device);
+    res = run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
+    set_tape_block_size_with_mt(bkpinfo->internal_tape_block_size);
+    return(res);
+}
+
+/**
+ * Handle OBDR if we were asked to do so
+ * @param tapedev The tape device to open for writing.
+ * @return 0 for success, nonzero for failure.
+ * @note This should be called ONLY from backup processes. It will OVERWRITE ANY
+ * EXISTING DATA on the tape!
+ */
+int create_obdr(void)
+{
+
+    char *command = NULL;
+    int res = 0;
+
+    log_it("Creating OBDR headers");
+    /* OBDR: First block 10 kB of zero bs = 512 */
+    asprintf(&command, "mt -f %s compression off",bkpinfo->media_device);
+    res = run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
+    asprintf(&command, "mt -f %s rewind",bkpinfo->media_device);
+    res += run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
+    set_tape_block_size_with_mt(512);
+
+    asprintf(&command, "dd if=/dev/zero of=%s bs=512 count=20",bkpinfo->media_device);
+    res += run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
+    /* OBDR: then ISO boot image bs = 2048 */
+    set_tape_block_size_with_mt(2048);
+
+    asprintf(&command, "dd if=%s of=%s bs=2048",MINDI_CACHE"/mondorescue.iso",bkpinfo->media_device);
+    res += run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
+    set_tape_block_size_with_mt(bkpinfo->internal_tape_block_size);
+    return(res);
 }
 
@@ -633 +750 @@
     int i;
     int j;
-    int res;
+    int res = 0;
     long length, templong;
     size_t k;
@@ -654 +771 @@
         return (0);
     }
+
+    // mondoarchive should have configured everything to give the right non-rew device
+    if ((bkpinfo->use_obdr) && (bkpinfo->media_device != NULL)) {
+        res = skip_obdr();
+        if (res != 0) {
+            log_it("Not able to skip OBDR - Restore will have to be done manually");
+        }
+    } else {
+        if (bkpinfo->media_device == NULL) {
+            log_it("Not able to skip OBDR - Restore will have to be done manually");
+        }
+        set_tape_block_size_with_mt(bkpinfo->internal_tape_block_size);
+    }
+
     insist_on_this_tape_number(1);
     mr_asprintf(&outfname, "%s/tmp/all.tar.gz", bkpinfo->tmpdir);
     make_hole_for_file(outfname);
-
-    set_tape_block_size_with_mt(bkpinfo->media_device,
-                                bkpinfo->internal_tape_block_size);
 
     log_it("Opening IN tape");
@@ -762 +890 @@
 /**
  * Start writing to a tape device for the backup.
+ * Handle OBDR if we were asked to do so
  * @param tapedev The tape device to open for writing.
  * @return 0 for success, nonzero for failure.
@@ -767 +896 @@
  * EXISTING DATA on the tape!
  */
-int openout_tape(char *tapedev, long internal_tape_block_size)
-{
+int openout_tape() {
+
     g_current_media_number = 1;
     if (g_tape_stream) {
@@ -777 +906 @@
     g_tape_posK = 0;
 
-    set_tape_block_size_with_mt(tapedev, internal_tape_block_size);
+    if (bkpinfo->use_obdr) {
+        create_obdr();
+    } else {
+        set_tape_block_size_with_mt(bkpinfo->internal_tape_block_size);
+    }
     log_it("Opening OUT tape");
     if (!
         (g_tape_stream =
-         open_device_via_buffer(tapedev, 'w', internal_tape_block_size))) {
+         open_device_via_buffer(bkpinfo->media_device, 'w', internal_tape_block_size))) {
         log_to_screen(_("Cannot openin stream device"));
         return (1);

branches/stable/mondo/src/common/libmondo-stream.h

@@ -14 +14 @@
 int openin_tape();
 int openout_cdstream(char *cddev, int speed);
-int openout_tape(char *tapedev, long internal_tape_block_size);
+int openout_tape();
 int read_file_from_stream_to_file(char *outfile,
                                   long long size);

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

@@ -677 +677 @@
 
 void setup_tmpdir(char *path) {
-    
+
     char *tmp = NULL;
     char *p = NULL;
@@ -687 +687 @@
         paranoid_free(tmp);
     }
-        
+
     if (path != NULL) {
         asprintf(&tmp, "%s/mondo.tmp.XXXXXX", path);
@@ -758 +758 @@
     }
     bkpinfo->boot_device[0] = '\0';
-    bkpinfo->restore_path[0] = '\0';
+    bkpinfo->image_devs[0] = '\0';
+    bkpinfo->compression_level = 3;
     bkpinfo->do_not_compress_these[0] = '\0';
     bkpinfo->verify_data = FALSE;
     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);
@@ -772 +775 @@
     mr_asprintf(&tmp,mr_conf->prefix);
     bkpinfo->prefix = tmp;
-
-    bkpinfo->make_filelist = TRUE;  // unless -J supplied to mondoarchive
+    sensibly_set_tmpdir_and_scratchdir();
+
     bkpinfo->optimal_set_size = 0;
-    bkpinfo->backup_media_type = none;
     bkpinfo->backup_media_string[0] = '\0';
     strcpy(bkpinfo->include_paths, "/");
+    bkpinfo->restore_path[0] = '\0';
     bkpinfo->call_before_iso[0] = '\0';
     bkpinfo->call_make_iso[0] = '\0';
     bkpinfo->call_after_iso[0] = '\0';
-    bkpinfo->image_devs[0] = '\0';
-    bkpinfo->postnuke_tarball[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->writer_speed = mr_conf->iso_burning_speed;
+    bkpinfo->manual_cd_tray = FALSE;
+    bkpinfo->nonbootable_backup = FALSE;
+    bkpinfo->make_cd_use_lilo = FALSE;
+    bkpinfo->use_obdr = FALSE;
+    bkpinfo->restore_mode = interactive;
 }
 

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

@@ -127 +127 @@
    */
     int index;
-    
+
   /**
    * Type of disk.
    */
     char type;  // ' ' = data (default), S = spare, F = faulty
-    
+
 };
 
@@ -184 +184 @@
 } 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__
@@ -236 +248 @@
        */
     int chunk_size;
-    
+
       /**
        * The parity algorithm of this RAID device. (RAID5 only)
@@ -582 +594 @@
    */
     bool make_cd_use_lilo;
+
+  /**
+   * If TRUE, make the the tape bootable. If FALSE, normal tape, the default
+   */
+    bool use_obdr;
+
+  /**
+   * Nature of the restore
+   */
+    t_restore_mode restore_mode;
 };
 

branches/stable/mondo/src/mondoarchive/mondoarchive.c

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

branches/stable/mondo/src/mondoarchive/mondoarchive.h

@@ -17 +17 @@
  */
 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/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 */