Ignore:
Timestamp:
Jul 24, 2011, 4:12:44 AM (9 years ago)
Author:
Bruno Cornec
Message:

svn merge -r 2773:2849 2.2.9 in 2.2.10

  • Adds 3 binaries called potentially by udev o support USB key mount at restore time (Victor Gattegno)
  • Really support both mkisofs and genisoimage everywhere
  • Try to handle netfs_user better in all cases (NFS and SSHFS)
    • Improve logging in init script
    • Format improvement
    • Removes a warning when trying to launch udevadm and it doesn't exist (RHEL 5 e.g.)
    • Fix syntax description in mondoarchive man page for -E & -I with |
  • Adds download entries for new distro supported (Mageia, Fedora 15, Ubuntu 11.04)

-Fix mindi-get-perl-modules when perl dirs in @INC are symlinks (case on Ubuntu 11.04)

  • Fix option --findkernel in case of Xen kernel so that mondoarchive get a correct answer instead of an empty one.
  • Fix multi-media restore by umounting it before looping to ask for the next (as if already mounted, will not pass to the next alone)
  • Fix 485 by replacing a wrong call to mr_asprintf which was provoking core dumped.
  • Fix -E and -I example in man page which were lacking the '|' as separator
  • Fix #484 by adding support for the arcmsr driver (to support the Areca ARC-1220 RAID Controller)
    • Avoids error msgs if no mondo-restore.cfg file exists (when mindi used stdalone)
    • Adds the swapon feature to mindi-busybox
    • Attempt to fix Xen kernel support by avoiding to remove xen kernel fro; the possible_kernels list too early, whereas it's used afterwards to get them.
    • Fix #481 by supporting the new kbd file in latest Ubuntu 10.10+ (victor.gattegno_at_hp.com)
  • Update from Lester Wade on P2V doc including RHEL6 validation and some minor additions
  • removes telinit call in busybox o try to fix problems whn reboot at end of restore.
  • if -E option for mondoarchive was not specified, variable excp points to NULL, so string exclude_pathes contained '(null)' instead of being avoided (derived from a patch from taguchi_at_ff.iij4u.or.jp)
  • fix -maxdepth option for find command. it sould be '-maxdepth .. -name ..', not '-name .. -maxdepth ..' (patch from taguchi_at_ff.iij4u.or.jp)
  • Adds an extraversion for revision support
  • Adds support for ifconfig and ping for PXE+NFS boot for this version of mindi-busybox
  • Example of MINDI_ADDITIONAL_BOOT_PARAMS in mindi.conf added
  • fix a compilation error
  • Remove an absolute ref in the docs web page
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.10/mindi/mindi

    r2830 r2850  
    5757MY_FSTAB=/etc/fstab
    5858TAPE_MODS="ht st osst ide-tape ide_tape"
    59 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 hpsa 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 iscsi_tcp libiscsi scsi_transport_iscsi libiscsi_tcp isp megaraid megaraid_mm megaraid_mbox megaraid_sas mega_sr mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qla2400 qla2xxx qla2xxx_conf qlogicfas qlogicfc qlogicisp qlogicfas qlogicfas408 raw1394 scsi_mod scsi_transport_sas scsi_transport_spi scsi_transport_fc sd_mod crc_t10dif crc-t10dif seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs intermodule scsi_dh scsi_tgt emcpdm emcpgpx emcpmpx emcp dc395x diskdumplib scsi_dump_register"
     59SCSI_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 hpsa 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 iscsi_tcp libiscsi scsi_transport_iscsi libiscsi_tcp isp megaraid megaraid_mm megaraid_mbox megaraid_sas mega_sr mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qla2400 qla2xxx qla2xxx_conf qlogicfas qlogicfc qlogicisp qlogicfas qlogicfas408 raw1394 scsi_mod scsi_transport_sas scsi_transport_spi scsi_transport_fc sd_mod crc_t10dif crc-t10dif seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs intermodule scsi_dh scsi_tgt emcpdm emcpgpx emcpmpx emcp dc395x diskdumplib scsi_dump_register arcmsr"
    6060
    6161# ide-probe-mod
     
    369369        echo -e "$DONE"
    370370        return 0
    371     elif [ -e "/etc/console-setup/boottime.kmap.gz" ] ; then
     371    elif [ -e "/etc/console-setup/boottime.kmap.gz" ] || [ -e "/etc/console-setup/cached.kmap.gz" ] ; then
    372372        LogFile "Ubuntu-style config detected."
    373373        mkdir -p $bigdir/tmp
    374         echo "/etc/console-setup/boottime.kmap.gz" > $MINDI_CACHE/KEYMAP-LIVES-HERE
     374        if [ -e "/etc/console-setup/boottime.kmap.gz" ] ; then
     375            kbdfile="/etc/console-setup/boottime.kmap.gz"
     376        else
     377            kbdfile="/etc/console-setup/cached.kmap.gz"
     378        fi
     379        echo $kbdfile > $bigdir/tmp/KEYMAP-LIVES-HERE
    375380        KBDEPTH=0
    376381        mkdir -p $bigdir/etc/console-setup
    377         cp /etc/console-setup/boottime.kmap.gz $bigdir/etc/console-setup 2>> $LOGFILE
     382        cp $kbdfile $bigdir/etc/console-setup 2>> $LOGFILE
    378383        echo -e "$DONE"
    379384        return 0
     
    938943    [ "$ESTIMATED_TOTAL_NOOF_SLICES" ] && echo "total-slices $ESTIMATED_TOTAL_NOOF_SLICES" >> $outfile
    939944    AddFileToCfgIfExists $MINDI_TMP/NETFS-SERVER-MOUNT  netfs-server-mount  $outfile
     945    AddFileToCfgIfExists $MINDI_TMP/NETFS-SERVER-USER  netfs-server-user  $outfile
    940946    AddFileToCfgIfExists $MINDI_TMP/NETFS-SERVER-PATH   netfs-server-path   $outfile
     947    AddFileToCfgIfExists $MINDI_TMP/NETFS-SERVER-IPADDR netfs-server-ipaddr $outfile
     948    AddFileToCfgIfExists $MINDI_TMP/NETFS-PROTO         netfs-proto           $outfile
    941949    AddFileToCfgIfExists $MINDI_TMP/NETFS-DEV           netfs-dev           $outfile
    942950    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-IPADDR netfs-client-ipaddr $outfile
     
    944952    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-BROADCAST netfs-client-broadcast $outfile
    945953    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-DEFGW  netfs-client-defgw  $outfile
     954    AddFileToCfgIfExists $MINDI_TMP/ISO-DEV           iso-dev           $outfile
     955    AddFileToCfgIfExists $MINDI_TMP/ISO-MNT           iso-mnt           $outfile
     956    AddFileToCfgIfExists $MINDI_TMP/ISO-PREFIX        iso-prefix        $outfile
     957    AddFileToCfgIfExists $MINDI_TMP/ISODIR            isodir            $outfile
    946958    AddFileToCfgIfExists $MINDI_TMP/BOOTLOADER.DEVICE bootloader.device $outfile
    947959    AddFileToCfgIfExists $MINDI_TMP/BOOTLOADER.NAME   bootloader.name   $outfile
     
    10421054            # 1st try, findfs - the RHEL way of finding labels and their partitions
    10431055            if [ -x "/sbin/findfs" ]; then
    1044                 actual_dev=`/sbin/findfs LABEL=${redhat_label} 2> /dev/null`
     1056                actual_dev=`/sbin/findfs LABEL="${redhat_label}" 2> /dev/null`
    10451057            fi
    10461058   
     
    21372149        fi
    21382150    fi
    2139     possible_kernels=`echo "$possible_kernels" | tr -s ' ' '\n' | grep -vi "xen" | sort -u | tr '\n' ' '`
    2140     noof_kernels=`CountItemsIn "$possible_kernels"`
    21412151    if [ $KERNEL_IS_XEN = "yes" ]; then
    21422152        possible_xenkernels=`echo "$possible_kernels" | tr -s ' ' '\n' | grep -i "xen" | sort -u | tr '\n' ' '`
     
    21442154        FindMboot32Binary
    21452155    fi
     2156    possible_kernels=`echo "$possible_kernels" | tr -s ' ' '\n' | grep -vi "xen" | sort -u | tr '\n' ' '`
     2157    noof_kernels=`CountItemsIn "$possible_kernels"`
    21462158    if [ "$noof_kernels" -eq "0" ] ; then
    21472159        LogAll "Could not find your kernel."
     
    21602172            if echo $i | grep "$KERVERRUN" ; then
    21612173                LogAll "OK, I used my initiative and found that "
    2162                 LogAll "$i is probably your kernel. "
     2174                LogAll "$i is probably your kernel. "
    21632175                output="$i"
    21642176            fi
     
    21842196        else
    21852197            for i in $possible_xenkernels ; do
    2186                 if echo $i | grep "$KERVERRUN" ; then
     2198                    if echo $i | grep "$KERVERRUN" ; then
    21872199                    LogIt "OK, I used my initiative and found that "
    2188                     LogIt "$i is probably your Xen kernel. "
     2200                        LogIt "$i is probably your Xen kernel. "
    21892201                    xenkernelpath="$i"
    21902202                fi
     
    21962208                    LogIt "Using $xenkernelpath"
    21972209                else
    2198                     LogIt "Two or more possible Xen kernels found. You may specify any one of them and the "
     2210                        LogIt "Two or more possible Xen kernels found. You may specify any one of them and the "
    21992211                    LogIt "boot disks will still work, probably. If one does not work, try another."
    2200                     LogIt "$possible_xenkernels"
     2212                        LogIt "$possible_xenkernels"
    22012213                    echo ""
    22022214                    xenkernelpath=`echo $possible_xenkernels | tr -s ' ' '\n' | head -1`
     
    26812693        export MONDO_SHARE=""
    26822694        if [ "$res" = "" ] ; then
    2683             MindiExit -1
     2695            if [ $KERNEL_IS_XEN = "yes" ]; then
     2696                echo "$xenkernelpath"
     2697                MindiExit 0
     2698            else
     2699                MindiExit -1
     2700            fi
    26842701        else
    26852702            echo "$res"
Note: See TracChangeset for help on using the changeset viewer.