Changeset 3172 in MondoRescue

Timestamp:

Jul 28, 2013, 7:38:05 PM (11 years ago)

Author:

Bruno Cornec

Message:

• First modifications to add support for systemd-udev

Location:

branches/3.0/mindi

Files:

• deplist.d/udev.conf (modified) (1 diff)
• mindi (modified) (7 diffs)
• rootfs/etc/init.d/rcS (modified) (1 diff)

branches/3.0/mindi/deplist.d/udev.conf

@@ -22 +22 @@
 /usr/bin/udevd
 
+# Systemd
+/usr/lib/systemd/systemd-udevd
+
 /sbin/udevstart.static
 /sbin/udev_volume_id

branches/3.0/mindi/mindi

@@ -255 +255 @@
     fi
 
-    # TODO: Why that
-    mkdir -p $bigdir/etc
     tar cf - -C / $mappath 2>> $MINDI_TMP/$$.log | (cd "$bigdir" ; tar xf -) || LogAll "WARNING: AKMF -- Could not copy $mappath to $bigdir" $MINDI_TMP/$$.log
     if [ "`echo $mappath | grep -F ".gz"`" ] ; then
@@ -629 +627 @@
     if [ _"$MONDO_SHARE" != _"" ]; then
         mkdir -p $bigdir/tmp
-        mkdir -p $bigdir/sbin
-        mkdir -p $bigdir/bin
+        mkdir -p $bigdir/usr/bin
         if [ -e "$MINDI_TMP/post-nuke.tgz" ] ; then
             LogAll "\nINFO: Incorporating post-nuke tarball"
@@ -909 +906 @@
         echo "$d"
         d2=`readlink $d`
-        c2=`echo $d2 |  | cut -c1`
+        c2=`echo $d2 | cut -c1`
         if [ "$c2" != "/" ]; then
             if [ "$c2" != "." ]; then
@@ -2075 +2072 @@
     includefile=$MINDI_TMP/$$.includefile.txt
 
+    # Check whether /lib64 or /lib is a link and if so explicitly create one in rootfs
+    if [ -h "/lib64" ]; then
+        mkdir -p lib || LogIt "ERROR: Unable to create lib in $mountpoint."
+        if [ ! -h lib64 ]; then
+            ln -s lib lib64 || LogIt "ERROR: /lib64 is a symbolic link, but I couldn't create it in $mountpoint."
+        fi
+    fi
+    if [ -h "/lib" ]; then
+        mkdir -p usr/lib || LogIt "ERROR: Unable to create usr/lib in $mountpoint."
+        mv lib/* usr/lib 2> /dev/null
+        if [ -d "lib" ]; then
+            rmdir lib
+        fi
+    fi
+    # Check whether /sbin and /bin are a link and if so explicitly create one in rootfs (Fedora 17 crazyness)
+    if [ -h "/sbin" ]; then
+        mkdir -p usr/sbin || LogIt "ERROR: Unable to create usr/sbin in $mountpoint."
+        mv sbin/* usr/sbin 2> /dev/null
+        if [ -d "sbin" ]; then
+            rmdir sbin
+        fi
+    fi
+    if [ -h "/bin" ]; then
+        mkdir -p usr/bin || LogIt "ERROR: Unable to create usr/bin in $mountpoint."
+        mv bin/* usr/bin 2> /dev/null
+        if [ -d "bin" ]; then
+            rmdir bin
+        fi
+    fi
+
     lfiles=`ls $DEPLIST_DIR/* | grep -v /minimal`
     if [ -e "$DEPLIST_FILE" ]; then
@@ -2495 +2522 @@
     cd "$mountpoint"
 
-    # Check whether /lib64 or /lib is a link and if so explicitly create one in rootfs
-    if [ -h "/lib64" ]; then
-        mkdir -p lib || LogIt "ERROR: Unable to create lib in $mountpoint."
-        ln -s lib lib64 || LogIt "ERROR: /lib64 is a symbolic link, but I couldn't create it in $mountpoint."
-    fi
-    if [ -h "/lib" ]; then
-        mkdir -p usr/lib || LogIt "ERROR: Unable to create usr/lib in $mountpoint."
-        mv lib/* usr/lib
-        rmdir lib
-    fi
-    # Check whether /sbin and /bin are a link and if so explicitly create one in rootfs (Fedora 17 crazyness)
-    if [ -h "/sbin" ]; then
-        mkdir -p usr/sbin || LogIt "ERROR: Unable to create usr/sbin in $mountpoint."
-        mv sbin/* usr/sbin
-        rmdir sbin
-    fi
-    if [ -h "/bin" ]; then
-        mkdir -p usr/bin || LogIt "ERROR: Unable to create usr/bin in $mountpoint."
-        mv bin/* usr/bin
-        rmdir bin
-    fi
-
+    
     # Check files before copying to discover configuration issues or McAfee preventing mindi reading these files
     for f in $tgz_dir_fname/*; do 
@@ -2576 +2582 @@
     # recent bash says that -d is true for a link to a dir !
     for f in `sort -u $MINDI_TMP/minimal.lis`; do
-        if [ -e $f -a ! -d $f ] || [ -h $f ]; then
+        if [ -e $f -a ! -d $f ] || [ -h $f -a ! -d $f ]; then
             finallist="$finallist $f"
         fi
@@ -2611 +2617 @@
             tar cf - -C / /lib/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogIt "ERROR: Problem in /lib/udev analysis" $MINDI_TMP/$$.log
         fi
-        if [ -x /sbin/udevd ] || [ -x /usr/bin/udevd ]; then
+        if [ -x /sbin/udevd ] || [ -x /usr/bin/udevd ] || [ -x /usr/lib/systemd/systemd-udevd ]; then
             lis2=`grep -Ev '^#' $DEPLIST_DIR/udev.conf`
             lis=""

branches/3.0/mindi/rootfs/etc/init.d/rcS

@@ -400 +400 @@
         elif [ -x /usr/bin/udevd ]; then
             /usr/bin/udevd --daemon &
+        elif [ -x /usr/lib/systemd/systemd-udevd ]; then
+            /usr/lib/systemd/systemd-udevd -daemon &
         fi
         echo "Waiting for udev to start..."