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/rootfs/sbin/init

    r2832 r2850  
    102102    if which loadkeys > /dev/null 2> /dev/null ; then
    103103        loadkeys $fname
     104        LogIt "Using $fname keyboard map." 1
    104105    else
    105106        LogIt "Using default US keyboard map." 1
     
    240241
    241242# Taken from udev management in Mandriva 2008.0. Kudos guys
    242 make_extra_nodes () {
     243MakeExtraNodes () {
    243244    # there are a few things that sysfs does not export for us.
    244245    # these things are listed in /etc/udev/links.conf
     
    255256}
    256257
    257 create_dev_makedev() {
     258CreateDevMakedev() {
    258259  if [ -e /sbin/MAKEDEV ]; then
    259260    ln -sf /sbin/MAKEDEV /dev/MAKEDEV
     
    266267    # Inspiration from Mandriva 2008.0 startup script
    267268    echo "Preparing udev environment..."
     269    LogIt "Preparing udev environment..."
    268270    mv /dev /dev.static
    269271    mkdir /dev
    270272    mount -n -o size=5M,mode=0755 -t tmpfs none /dev
    271     make_extra_nodes
     273    MakeExtraNodes
    272274    mount -n -t devpts -o mode=620 none /dev/pts
    273275    mount -n -t tmpfs  none /dev/shm
     
    289291        echo "Waiting for udev to start..."
    290292        sleep 5
     293        LogIt "udev started manually"
    291294    fi
    292295    mkdir -p /dev/.udev/queue/
     
    295298    fi
    296299    echo "Waiting for udev to discover..."
    297     create_dev_makedev
     300    CreateDevMakedev
    298301    # Newer version use udevadm for that
    299302    if [ -x /sbin/udevsettle ]; then
    300303        /sbin/udevsettle --timeout=10
     304        LogIt "Discovering with udevsettle"
    301305    elif [ -x /sbin/udevadm ]; then
    302         /sbin/udevadm trigger
     306        UdevadmTrigger
    303307        /sbin/udevadm settle --timeout=10
     308        LogIt "Discovering with udevadm"
    304309    fi
    305310    # It seems we need to have more static devs on some distro where
     
    343348
    344349
    345 #RunDevfsd() {
    346 #    loc=`which devfsd 2> /dev/null`
    347 #    if [ "$loc" != "" ] ; then
    348 #        LogIt "Starting devfsd"
    349 #        devfsd /dev &
    350 #        sleep 5
    351 #    fi
    352 #}
    353 
    354 
    355 
    356350StartUSBKbd() {
    357351# Prepare minimal USB env in case we have USB kbd such as with iLO
     
    374368        LogIt "Scanning LVM's..." 1
    375369        if which lvm ; then
    376             modprobe -q dm-mod
    377             modprobe -q dm_mod
    378             lvm vgscan --mknodes
     370            modprobe -q dm-mod
     371            modprobe -q dm_mod
     372            lvm vgscan --mknodes
    379373        else
    380             vgscan
     374            vgscan
    381375        fi
    382376
     
    413407        /tmp/start-lvm &
    414408        for i in 1 2 3 4 5 ; do
    415             echo -en "."
    416             sleep 1
     409            echo -en "."
     410            sleep 1
    417411        done
    418412        rm -f /tmp/start-lvm
     
    427421
    428422    # Taken from the init script of EMC PowerPath on RHEL
    429     if [ -f /etc/emcp_devicesDB.dat ]; then
    430         if [ -f /etc/emcp_devicesDB.idx ]; then
    431             /etc/opt/emcpower/emcpmgr map -p > /dev/null 2>&1
    432         fi
    433     fi
    434 
    435     /sbin/powermt config > /dev/null 2>&1
    436     #  Wait for udev to finish creating emcpower devices
    437     #
    438     pdfound=1
    439     for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
    440         pdfound=1
    441         for pd in `/bin/ls -d /sys/block/emcpower* 2> /dev/null`; do
    442            bpd=`basename $pd`
    443            if [ ! -e /dev/$bpd ]; then
    444               pdfound=0
    445               sleep 2
    446               break;
    447            fi
    448         done
    449         if [ "$pdfound" -eq 1 ]; then
     423    if [ -f /etc/emcp_devicesDB.dat ]; then
     424        if [ -f /etc/emcp_devicesDB.idx ]; then
     425            /etc/opt/emcpower/emcpmgr map -p > /dev/null 2>&1
     426        fi
     427    fi
     428
     429    /sbin/powermt config > /dev/null 2>&1
     430    #   Wait for udev to finish creating emcpower devices
     431    #
     432    pdfound=1
     433    for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
     434        pdfound=1
     435        for pd in `/bin/ls -d /sys/block/emcpower* 2> /dev/null`; do
     436            bpd=`basename $pd`
     437            if [ ! -e /dev/$bpd ]; then
     438                pdfound=0
     439                sleep 2
     440                break;
     441            fi
     442        done
     443        if [ "$pdfound" -eq 1 ]; then
    450444            break
    451         fi
    452     done
    453     if [ "$pdfound" -eq 0 ]; then
    454        echo "Unable to start PowerPath"
    455     fi
    456 
    457     /sbin/powermt load      > /dev/null 2>&1
    458     /etc/opt/emcpower/emcpmgr map   > /dev/null 2>&1
    459     /etc/opt/emcpower/powercf -C    > /dev/null 2>&1
    460     if [ ! -e /etc/powermt.custom ]; then
    461        /sbin/powermt save       > /dev/null 2>&1
    462     fi
    463     /sbin/powermt register  > /dev/null 2>&1
    464     /sbin/powermig transition -startup -noprompt   > /dev/null 2>&1
     445        fi
     446    done
     447    if [ "$pdfound" -eq 0 ]; then
     448        echo "Unable to start PowerPath"
     449    fi
     450
     451    /sbin/powermt load      > /dev/null 2>&1
     452    /etc/opt/emcpower/emcpmgr map   > /dev/null 2>&1
     453    /etc/opt/emcpower/powercf -C    > /dev/null 2>&1
     454    if [ ! -e /etc/powermt.custom ]; then
     455        /sbin/powermt save      > /dev/null 2>&1
     456    fi
     457    /sbin/powermt register  > /dev/null 2>&1
     458    /sbin/powermig transition -startup -noprompt    > /dev/null 2>&1
    465459}
    466460
     
    482476                /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -p p"
    483477            fi
     478            LogIt "Multipath started"
    484479        fi
    485480    fi
     
    678673
    679674ExtractDataDisksAndLoadModules() {
    680     echo "Installing additional tools ..."
     675    LogIt "Installing additional tools ..." 1
    681676    install-additional-tools
    682677    # Keep the kernel silent again
     
    898893# Not sure it's still needed, but shouldn't hurt
    899894if [ "$USE_UDEV" = "yes" ]; then
    900     if [ -x /sbin/udevadm ]; then
    901         UdevadmTrigger
    902     fi
     895    UdevadmTrigger
    903896
    904897fi
Note: See TracChangeset for help on using the changeset viewer.