Changeset 3489 in MondoRescue for branches/3.2/mindi

Timestamp:

Dec 4, 2015, 1:32:09 AM (8 years ago)

Author:

Bruno Cornec

Message:

On Debian 8 we need to use /lib/systemd instead of /usr/lib/systemd

Location:

branches/3.2/mindi

Files:

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

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

@@ -29 +29 @@
 /etc/systemd
 /usr/lib/systemd
+/lib/systemd
 /usr/lib/kernel
 /usr/lib/tmpfiles.d

branches/3.2/mindi/mindi

@@ -2634 +2634 @@
             tar cf - -C / /usr/lib/udev 2> $templog | tar xf -  || LogIt "ERROR: Problem in /usr/lib/udev analysis" $templog
         fi
-        if [ -x /sbin/udevd ] || [ -x /usr/bin/udevd ] || [ -x /usr/lib/systemd/systemd-udevd ]; then
+        if [ -x /sbin/udevd ] || [ -x /usr/bin/udevd ] || [ -x /usr/lib/systemd/systemd-udevd ] || [ -x /lib/systemd/systemd-udevd ]; then
             lis2=`grep -Ev '^#' $DEPLIST_DIR/udev.conf`
             lis=""

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

@@ -74 +74 @@
 ExtractDevTarballs() {
     cd /
-    if [ -x /usr/lib/systemd/systemd-udevd ]; then
+    if [ -x /usr/lib/systemd/systemd-udevd ] || [ -x /lib/systemd/systemd-udevd ]; then
         # Just use vc dev files. The other are useless and create huge delays with LVM
         tar -zxf /vc.tgz || LogIt "Error occurred while extracting /vc.tgz"
@@ -384 +384 @@
     mkdir /dev
     # Contributed during LinuxCon Japan !
-    if [ -x /usr/lib/systemd/systemd-udevd ]; then
+    if [ -x /usr/lib/systemd/systemd-udevd ] || [ -x /lib/systemd/systemd-udevd ]; then
         mount -n -t devtmpfs none /dev
     else
@@ -413 +413 @@
         elif [ -x /usr/bin/udevd ]; then
             /usr/bin/udevd --daemon &
-        elif [ -x /usr/lib/systemd/systemd-udevd ]; then
+        elif [ -x /usr/lib/systemd/systemd-udevd ] || [ -x /lib/systemd/systemd-udevd ]; then
             # from https://github.com/hut/minirc/blob/master/rc
             echo "INFO: This is the systemd version of udev"
@@ -421 +421 @@
             mkdir -p /run/udev
             mkdir -p /run/systemd/journal
-            /usr/lib/systemd/systemd-udevd --daemon
+            if [ -x /usr/lib/systemd/systemd-udevd ]; then
+                /usr/lib/systemd/systemd-udevd --daemon
+            else
+                /lib/systemd/systemd-udevd --daemon
+            fi
             udevadm trigger --action=add --type=subsystems
             udevadm trigger --action=add --type=devices