Changeset 2596 in MondoRescue for branches

Timestamp:

Mar 17, 2010, 3:55:28 AM (15 years ago)

Author:

Bruno Cornec

Message:

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

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

Location:

branches/2.2.10/mindi

Files:

• mindi (modified) (3 diffs)
• rootfs/sbin/init (modified) (4 diffs)

branches/2.2.10/mindi/mindi

@@ -912 +912 @@
     use_comp=$USE_COMP; [ "$use_comp" = "" ] && use_comp="yes"
     use_star=$USE_STAR; [ "$use_star" = "" ] && use_star="no"
+    use_udev=$USE_UDEV; [ "$use_udev" = "" ] && use_udev="no"
     echo "use-lzo $use_lzo" >> $outfile
     echo "use-lzma $use_lzma" >> $outfile
     echo "use-star $use_star" >> $outfile
     echo "use-comp $use_comp" >> $outfile
+    echo "use-udev $use_udev" >> $outfile
     echo "datestamp `date`" >> $outfile
     [ "$ESTIMATED_TOTAL_NOOF_SLICES" ] && echo "total-slices $ESTIMATED_TOTAL_NOOF_SLICES" >> $outfile
@@ -2154 +2156 @@
 
     # Management of udev (which includes modprobe in rules)
+    USE_UDEV=""
     ps auxww | grep -v grep | grep -qw udevd
     if [ $? -eq 0 ]; then
-        echo "udev device manager found" > $MINDI_CACHE/USE-UDEV
-        echo $MINDI_CACHE/USE-UDEV >> $MINDI_TMP/cp.lis
+        USE_UDEV="yes"
         LogFile "udev device manager found"
         echo /etc/udev /lib*/udev >> $MINDI_TMP/cp.lis
@@ -2175 +2177 @@
             LogAll "udevd daemon not in standard place (/sbin)"
             LogAll "mindi will use static devices which may cause problems"
-            rm -f $MINDI_CACHE/USE-UDEV
         fi
     fi

branches/2.2.10/mindi/rootfs/sbin/init

@@ -675 +675 @@
     # Retry failed udev events now that local filesystems are mounted read-write
     # (useful for rules creating network ifcfg files)
-    if [ -e "$MINDI_CACHE/USE-UDEV" ] ; then
+    if [ "$USE_UDEV" = "yes" ]; then
         if [ -x /sbin/udevadm ]; then
             udaver=`/sbin/udevadm --version`
@@ -751 +751 @@
 fi
 
-if [ -e "$MINDI_CACHE/USE-UDEV" ] ; then
+USE_UDEV=""
+if [ -f $MINDI_CACHE/mondorestore.cfg ]; then
+    USE_UDEV=`grep "use_udev" $MINDI_CACHE/mondorestore.cfg | cut -d' ' -f2`
+fi
+if [ "$USE_UDEV" = "yes" ]; then
     RunUdevd
 fi
@@ -776 +780 @@
 fi
 
-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
+if [ -f $MINDI_CACHE/mondorestore.cfg ] && [ "`grep -i 'obdr ' $MINDI_CACHE/mondorestore.cfg 2>/dev/null`" ]; then
     HandleTape
     ExtractDataDisksAndLoadModules
@@ -876 +880 @@
 
 # Not sure it's still needed, but shouldn't hurt
-if [ -e "/tmp/USE-UDEV" ] ; then
+if [ "$USE_UDEV" = "yes" ]; then
     if [ -x /sbin/udevadm ]; then
         /sbin/udevadm trigger --retry-failed
     fi
+
 fi
 if [ -f $MINDI_CACHE/mondorestore.cfg ] && [ grep "backup-media-type" $MINDI_CACHE/mondorestore.cfg > /dev/null 2> /dev/null ]; then