Changeset 2460 in MondoRescue for branches/2.2.10

Timestamp:

Oct 9, 2009, 3:18:59 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Adds a conf file example for mindi and fix #360 + mode of file
• Apply path from Matthew Cline (matt_at_nightrealms.com) in order to fix #359
• Adds support for libcrc32c (needed by bnx2x)
• afio is under /bin on Debian
• Fix an error in the test for grub conf files (or used instead of and)
• Fix a bug in handling of -E option with real devices (bad report in function mr_make_devlist_from_pathlist of the test between -E and -I)
• CIFS mounts shouldn't be part of the mountlist analysis (should help solving #288)

Location:

branches/2.2.10

Files:

• mindi/deplist.d/base.conf (modified) (1 diff)
• mindi/install.sh (modified) (1 diff)
• mindi/mindi (modified) (5 diffs)
• mindi/mindi.conf (copied) (copied from branches/2.2.9/mindi/mindi.conf )
• mondo/src/common/libmondo-archive.c (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (3 diffs)

branches/2.2.10/mindi/deplist.d/base.conf

@@ -17 +17 @@
 /usr/sbin/mondorestore
 /usr/bin/afio
+# On Debian
+/bin/afio
 /usr/bin/star
 /usr/sbin/ntfsclone

branches/2.2.10/mindi/install.sh

@@ -76 +76 @@
 install -m 755 analyze-my-lvm $locallib/mindi
 install -m 644 msg-txt dev.tgz $locallib/mindi
-install -m 644 deplist.conf deplist-minimal.conf udev.files proliant.files $conf
+install -m 644 deplist.conf deplist-minimal.conf udev.files proliant.files mindi.conf $conf
 for f in deplist.d/*.conf; do
     install -m 644 $f $conf/deplist.d

branches/2.2.10/mindi/mindi

@@ -58 +58 @@
 PCMCIA_MODS="pcmcia_core ds yenta_socket"
 USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage input hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid keybdev mousedev libusual scsi_mod ff-memless"
-NET_MODS="auth_rpcgss sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 bnx2 bnx2x e1000 e1000e igb eepro100 ne2k-pci tg3 libphy pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmnet exportfs fuse"
+NET_MODS="auth_rpcgss sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 bnx2 bnx2x e1000 e1000e igb eepro100 ne2k-pci tg3 libphy pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmnet exportfs fuse libcrc32c"
 CDROM_MODS="$TAPE_MODS $IDE_MODS $USB_MODS $PCMCIA_MODS $SCSI_MODS $NET_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_base nls_cp437 nls_utf8 sg sr_mod zlib_inflate iso9660"
 # Those modules will only go on the backup media, not the boot media.
@@ -98 +98 @@
 ISO_CMD="/usr/bin/mkisofs"
 ISO_OPT="-J -r -v -p Mindi -publisher http://www.mondorescue.org -A Mindi"
+
+# Mandriva system e.g. use cdrkit, which uses genisoimage instead of mkisofs.
+# However, they use exactly the same command line parameters, so just
+# use genisoimage if it's available.
+if [ ! -x $ISO_CMD ]; then
+    ISO_CMD=/usr/bin/genisoimage
+fi
 
 # Now we can create what we need
@@ -977 +984 @@
     useless_dev="/dev/floppy /dev/fd0h1440 /dev/fd0H1440 /dev/cdrom /dev/cdrom/cdrom /dev/cdrom/cdrom1 /dev/cdrom/cdrom2 /dev/cdrom0 /dev/cdrom1 /dev/cdrom2 /dev/cdrom3 /dev/cdrw /dev/scd /dev/ram :/ /dev/sr0 /dev/sr1 /dev/cdrom1"
     for c_p in $all_partitions ; do
-        [ "`echo "$useless_dev" | grep -F "$c_p"`" != "" ] || [ "`echo "$c_p" | grep ":"`" != "" ] && continue
+        # Skip evices, network FS, cisf
+        [ "`echo "$useless_dev" | grep -F "$c_p"`" != "" ] || [ "`echo "$c_p" | grep ":"`" != "" ] || [ "`echo "$c_p" | grep -E "^//"`" != "" ]&& continue
         [ "`echo "$c_p" | grep -x "/dev/cdroms.*"`" ] && continue
         if [ -h "$c_p" ] && [ "`echo "$c_p" | grep -F "/dev/hd"`" = "" ] && [ "`echo "$c_p" | grep -F "/dev/sd"`" = "" ] && [ "`echo "$c_p" | grep -F "/dev/md"`" = "" ] ; then
@@ -1323 +1331 @@
 OfferToMakeBootableISO() {
     local i old_pwd
+    if [ -z "$ISO_CMD" ]; then
+        LogIt "Neither mkisofs nor genisoimage found, unable to make CD image"
+        return
+    fi
     if [ "$PROMPT_MAKE_CD_IMAGE" = "yes" ] && [ _"$MONDO_SHARE" = _"" ]; then
         echo -en "Shall I make a bootable CD image? (y/[n]) "
@@ -2656 +2668 @@
 fi
 
+# Check for ISO_CMD command
+if [ ! -x $ISO_CMD ]; then
+    echo "NOTE: No CD image (ISO file) utility found" >> $LOGFILE
+fi
+
 FLOPPY_WAS_MOUNTED=""
 for mtpt in /media/floppy /mnt/floppy /floppy ; do

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

@@ -687 +687 @@
             run_program_and_log_output("ln -sf /boot/grub/grub.conf /boot/grub/menu.lst", 5);
         }
-        if ((!does_file_exist("/boot/grub/menu.lst")) || (!does_file_exist("/boot/grub/grub.cfg"))) {
+        if ((!does_file_exist("/boot/grub/menu.lst")) && (!does_file_exist("/boot/grub/grub.cfg"))) {
             fatal_error("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst or /boot/grub/grub.cfg but I cannot find it there. What is wrong with your Linux distribution?");
         }

branches/2.2.10/mondo/src/common/libmondo-devices.c

@@ -1632 +1632 @@
         /* There were no partitions on the disk */
         log_msg(4, "No partitions on device special file %s", dsf);
-        log_msg(4, "I guess it's a partiion itself");
+        log_msg(4, "I guess it's a partition itself");
         mr_asprintf(partitions[0], "%s", dsf);
         mr_asprintf(tmp, "%s", dsf);
@@ -1914 +1914 @@
             log_msg(1, "WARNING ! %s doesn't exist in -E option", token);
         } else {
+            log_msg(1, "ERROR ! %s doesn't exist in -I option", token);
             fatal_error("Error processing -I option");
         }
@@ -1926 +1927 @@
                 mr_strcat(bkpinfo->exclude_paths, "%s ", mounted_on_dsf);
                 mr_strcat(bkpinfo->exclude_devs, " %s ", token);
-            } else {
-                log_to_screen("Archiving only the following file systems on %s:\n", token);
-                log_to_screen("  %s\n", mounted_on_dsf);
-                mr_asprintf(bkpinfo->include_paths, "/");
-                if (strlen(not_mounted_on_dsf)) {
-                    log_msg (5, "Adding to bkpinfo->exclude_paths due to -I option: %s", not_mounted_on_dsf);
-                    log_to_screen("Not archiving the following file systems:\n");
-                    log_to_screen("  %s\n", not_mounted_on_dsf);
-                    mr_strcat(bkpinfo->exclude_paths, "%s ", not_mounted_on_dsf);
-                }
+            }
+        } else {
+            log_to_screen("Archiving only the following file systems on %s:\n", token);
+            log_to_screen("  %s\n", mounted_on_dsf);
+            strcpy(bkpinfo->include_paths, "/");
+            if (strlen(not_mounted_on_dsf)) {
+                log_msg (5, "Adding to bkpinfo->exclude_paths due to -I option: %s", not_mounted_on_dsf);
+                log_to_screen("Not archiving the following file systems:\n");
+                log_to_screen("  %s\n", not_mounted_on_dsf);
+                strcat(bkpinfo->exclude_paths, not_mounted_on_dsf);
+                strcat(bkpinfo->exclude_paths, "");
             }
         }