Changeset 2596

Show
Ignore:
Timestamp:
03/17/10 03:55:28 (5 months ago)
Author:
bruno
Message:

r3737@localhost: bruno | 2010-03-14 20:57:44 +0100

  • Suppress the USE_UDEV file and use the conf file instead in mindi
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/2.2.10/mindi/mindi

    r2589 r2596  
    912912    use_comp=$USE_COMP; [ "$use_comp" = "" ] && use_comp="yes" 
    913913    use_star=$USE_STAR; [ "$use_star" = "" ] && use_star="no" 
     914    use_udev=$USE_UDEV; [ "$use_udev" = "" ] && use_udev="no" 
    914915    echo "use-lzo $use_lzo" >> $outfile 
    915916    echo "use-lzma $use_lzma" >> $outfile 
    916917    echo "use-star $use_star" >> $outfile 
    917918    echo "use-comp $use_comp" >> $outfile 
     919    echo "use-udev $use_udev" >> $outfile 
    918920    echo "datestamp `date`" >> $outfile 
    919921    [ "$ESTIMATED_TOTAL_NOOF_SLICES" ] && echo "total-slices $ESTIMATED_TOTAL_NOOF_SLICES" >> $outfile 
    …… 
    21542156 
    21552157    # Management of udev (which includes modprobe in rules) 
     2158    USE_UDEV="" 
    21562159    ps auxww | grep -v grep | grep -qw udevd 
    21572160    if [ $? -eq 0 ]; then 
    2158         echo "udev device manager found" > $MINDI_CACHE/USE-UDEV 
    2159         echo $MINDI_CACHE/USE-UDEV >> $MINDI_TMP/cp.lis 
     2161        USE_UDEV="yes" 
    21602162        LogFile "udev device manager found" 
    21612163        echo /etc/udev /lib*/udev >> $MINDI_TMP/cp.lis 
    …… 
    21752177            LogAll "udevd daemon not in standard place (/sbin)" 
    21762178            LogAll "mindi will use static devices which may cause problems" 
    2177             rm -f $MINDI_CACHE/USE-UDEV 
    21782179        fi 
    21792180    fi 

  • branches/2.2.10/mindi/rootfs/sbin/init

    r2594 r2596  
    675675    # Retry failed udev events now that local filesystems are mounted read-write 
    676676    # (useful for rules creating network ifcfg files) 
    677     if [ -e "$MINDI_CACHE/USE-UDEV" ] ; then 
     677    if [ "$USE_UDEV" = "yes" ]; then 
    678678        if [ -x /sbin/udevadm ]; then 
    679679            udaver=`/sbin/udevadm --version` 
    …… 
    751751fi 
    752752 
    753 if [ -e "$MINDI_CACHE/USE-UDEV" ] ; then 
     753USE_UDEV="" 
     754if [ -f $MINDI_CACHE/mondorestore.cfg ]; then 
     755    USE_UDEV=`grep "use_udev" $MINDI_CACHE/mondorestore.cfg | cut -d' ' -f2` 
     756fi 
     757if [ "$USE_UDEV" = "yes" ]; then 
    754758    RunUdevd 
    755759fi 
    …… 
    776780fi 
    777781 
    778 if [ -f $MINDI_CACHE/mondorestore.cfg ] && [ "`grep -i 'obdr ' $MINDI_CACHE/mondorestore.cfg 2>/dev/null`" ] || [ "`grep -i ' udev' $MINDI_CACHE/mondorestore.cfg 2>/dev/null`" ]; then 
     782if [ -f $MINDI_CACHE/mondorestore.cfg ] && [ "`grep -i 'obdr ' $MINDI_CACHE/mondorestore.cfg 2>/dev/null`" ]; then 
    779783    HandleTape 
    780784    ExtractDataDisksAndLoadModules 
    …… 
    876880 
    877881# Not sure it's still needed, but shouldn't hurt 
    878 if [ -e "/tmp/USE-UDEV" ] ; then 
     882if [ "$USE_UDEV" = "yes" ]; then 
    879883    if [ -x /sbin/udevadm ]; then 
    880884        /sbin/udevadm trigger --retry-failed 
    881885    fi 
     886 
    882887fi 
    883888if [ -f $MINDI_CACHE/mondorestore.cfg ] && [ grep "backup-media-type" $MINDI_CACHE/mondorestore.cfg > /dev/null 2> /dev/null ]; then