Changeset 1720 in MondoRescue

Timestamp:

Oct 28, 2007, 1:04:56 PM (17 years ago)

Author:

Bruno Cornec

Message:

Intermediate step for tests: udevd is dynamically linked so we will need to support dyn linked ninaries earlier at restore time, which leads to the usage of a dyn linked busybox (good thing in itself, but implies lots of rework and checks)

Location:

branches/2.2.5/mindi

Files:

• mindi (modified) (2 diffs)
• rootfs/sbin/init (modified) (2 diffs)

branches/2.2.5/mindi/mindi

@@ -2769 +2769 @@
         cp --parents -Rdf /etc/udev . 2> /dev/null
         cp --parents -Rdf /lib/udev /lib64/udev . 2> /dev/null
+        if [ -x /sbin/udevd ]; then
+            LocateDeps /sbin/udevd > $MINDI_TMP/udev.lis
+            cp -a /sbin/udevd sbin
+        else
+            echo "udevd daemon not in standard place (/sbin)" 2>&1 | tee -a $LOGFILE
+            echo "mindi will use static devices" 2>&1 | tee -a $LOGFILE
+            rm -f tmp/USE-UDEV
+        fi
     fi
     for w in cdrom floppy groovy-stuff ; do
@@ -3134 +3142 @@
             MindiExit 0
         fi
+    elif [ "$1" = "--locatedeps" ] ; then
+        [ ! "$2" ] && Die "Please specify the binary to look at"
+        LocateDeps $2
+        # Avoids logfile content for mondo
+        export MONDO_SHARE=""
+        MindiExit $?
     elif [ "$1" = "--makemountlist" ] ; then
         [ ! "$2" ] && Die "Please specify the output file"

branches/2.2.5/mindi/rootfs/sbin/init

@@ -278 +278 @@
     mount -n -t devpts -o mode=620 none /dev/pts
     mount -n -t tmpfs  none /dev/shm
-    udevd --daemon
+    /sbin/udevd --daemon
 }
 
@@ -492 +492 @@
 rm -f /foozero
 
-echo 0 > /proc/sys/kernel/exec-shield 2>> /dev/null
+if [ -f /proc/sys/kernel/exec-shield ]; then
+    echo 0 > /proc/sys/kernel/exec-shield 2>> /dev/null
+fi
 
 if [ -e "/tmp/USE-UDEV" ] ; then
     RunUdevd
-fi
-ExtractDevTarballs
+else
+    ExtractDevTarballs
+fi
 LaunchTerminals