Changeset 2460


Ignore:
Timestamp:
Oct 9, 2009, 3:18:59 PM (9 years ago)
Author:
bruno
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:
5 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/2.2.10/mindi/deplist.d/base.conf

    r2445 r2460  
    1717/usr/sbin/mondorestore
    1818/usr/bin/afio
     19# On Debian
     20/bin/afio
    1921/usr/bin/star
    2022/usr/sbin/ntfsclone
  • branches/2.2.10/mindi/install.sh

    r2445 r2460  
    7676install -m 755 analyze-my-lvm $locallib/mindi
    7777install -m 644 msg-txt dev.tgz $locallib/mindi
    78 install -m 644 deplist.conf deplist-minimal.conf udev.files proliant.files $conf
     78install -m 644 deplist.conf deplist-minimal.conf udev.files proliant.files mindi.conf $conf
    7979for f in deplist.d/*.conf; do
    8080    install -m 644 $f $conf/deplist.d
  • branches/2.2.10/mindi/mindi

    r2451 r2460  
    5858PCMCIA_MODS="pcmcia_core ds yenta_socket"
    5959USB_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"
    60 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"
     60NET_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"
    6161CDROM_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"
    6262# Those modules will only go on the backup media, not the boot media.
     
    9898ISO_CMD="/usr/bin/mkisofs"
    9999ISO_OPT="-J -r -v -p Mindi -publisher http://www.mondorescue.org -A Mindi"
     100
     101# Mandriva system e.g. use cdrkit, which uses genisoimage instead of mkisofs.
     102# However, they use exactly the same command line parameters, so just
     103# use genisoimage if it's available.
     104if [ ! -x $ISO_CMD ]; then
     105    ISO_CMD=/usr/bin/genisoimage
     106fi
    100107
    101108# Now we can create what we need
     
    977984    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"
    978985    for c_p in $all_partitions ; do
    979         [ "`echo "$useless_dev" | grep -F "$c_p"`" != "" ] || [ "`echo "$c_p" | grep ":"`" != "" ] && continue
     986        # Skip evices, network FS, cisf
     987        [ "`echo "$useless_dev" | grep -F "$c_p"`" != "" ] || [ "`echo "$c_p" | grep ":"`" != "" ] || [ "`echo "$c_p" | grep -E "^//"`" != "" ]&& continue
    980988        [ "`echo "$c_p" | grep -x "/dev/cdroms.*"`" ] && continue
    981989        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
     
    13231331OfferToMakeBootableISO() {
    13241332    local i old_pwd
     1333    if [ -z "$ISO_CMD" ]; then
     1334        LogIt "Neither mkisofs nor genisoimage found, unable to make CD image"
     1335        return
     1336    fi
    13251337    if [ "$PROMPT_MAKE_CD_IMAGE" = "yes" ] && [ _"$MONDO_SHARE" = _"" ]; then
    13261338        echo -en "Shall I make a bootable CD image? (y/[n]) "
     
    26562668fi
    26572669
     2670# Check for ISO_CMD command
     2671if [ ! -x $ISO_CMD ]; then
     2672    echo "NOTE: No CD image (ISO file) utility found" >> $LOGFILE
     2673fi
     2674
    26582675FLOPPY_WAS_MOUNTED=""
    26592676for mtpt in /media/floppy /mnt/floppy /floppy ; do
  • branches/2.2.10/mondo/src/common/libmondo-archive.c

    r2451 r2460  
    687687            run_program_and_log_output("ln -sf /boot/grub/grub.conf /boot/grub/menu.lst", 5);
    688688        }
    689         if ((!does_file_exist("/boot/grub/menu.lst")) || (!does_file_exist("/boot/grub/grub.cfg"))) {
     689        if ((!does_file_exist("/boot/grub/menu.lst")) && (!does_file_exist("/boot/grub/grub.cfg"))) {
    690690            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?");
    691691        }
  • branches/2.2.10/mondo/src/common/libmondo-devices.c

    r2446 r2460  
    16321632        /* There were no partitions on the disk */
    16331633        log_msg(4, "No partitions on device special file %s", dsf);
    1634         log_msg(4, "I guess it's a partiion itself");
     1634        log_msg(4, "I guess it's a partition itself");
    16351635        mr_asprintf(partitions[0], "%s", dsf);
    16361636        mr_asprintf(tmp, "%s", dsf);
     
    19141914            log_msg(1, "WARNING ! %s doesn't exist in -E option", token);
    19151915        } else {
     1916            log_msg(1, "ERROR ! %s doesn't exist in -I option", token);
    19161917            fatal_error("Error processing -I option");
    19171918        }
     
    19261927                mr_strcat(bkpinfo->exclude_paths, "%s ", mounted_on_dsf);
    19271928                mr_strcat(bkpinfo->exclude_devs, " %s ", token);
    1928             } else {
    1929                 log_to_screen("Archiving only the following file systems on %s:\n", token);
    1930                 log_to_screen("  %s\n", mounted_on_dsf);
    1931                 mr_asprintf(bkpinfo->include_paths, "/");
    1932                 if (strlen(not_mounted_on_dsf)) {
    1933                     log_msg (5, "Adding to bkpinfo->exclude_paths due to -I option: %s", not_mounted_on_dsf);
    1934                     log_to_screen("Not archiving the following file systems:\n");
    1935                     log_to_screen("  %s\n", not_mounted_on_dsf);
    1936                     mr_strcat(bkpinfo->exclude_paths, "%s ", not_mounted_on_dsf);
    1937                 }
     1929            }
     1930        } else {
     1931            log_to_screen("Archiving only the following file systems on %s:\n", token);
     1932            log_to_screen("  %s\n", mounted_on_dsf);
     1933            strcpy(bkpinfo->include_paths, "/");
     1934            if (strlen(not_mounted_on_dsf)) {
     1935                log_msg (5, "Adding to bkpinfo->exclude_paths due to -I option: %s", not_mounted_on_dsf);
     1936                log_to_screen("Not archiving the following file systems:\n");
     1937                log_to_screen("  %s\n", not_mounted_on_dsf);
     1938                strcat(bkpinfo->exclude_paths, not_mounted_on_dsf);
     1939                strcat(bkpinfo->exclude_paths, "");
    19381940            }
    19391941        }
Note: See TracChangeset for help on using the changeset viewer.