Changeset 3489


Ignore:
Timestamp:
Dec 4, 2015, 1:32:09 AM (2 years ago)
Author:
bruno
Message:

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

Location:
branches/3.2/mindi
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi/deplist.d/udev.conf

    r3284 r3489  
    2929/etc/systemd
    3030/usr/lib/systemd
     31/lib/systemd
    3132/usr/lib/kernel
    3233/usr/lib/tmpfiles.d
  • branches/3.2/mindi/mindi

    r3485 r3489  
    26342634            tar cf - -C / /usr/lib/udev 2> $templog | tar xf -  || LogIt "ERROR: Problem in /usr/lib/udev analysis" $templog
    26352635        fi
    2636         if [ -x /sbin/udevd ] || [ -x /usr/bin/udevd ] || [ -x /usr/lib/systemd/systemd-udevd ]; then
     2636        if [ -x /sbin/udevd ] || [ -x /usr/bin/udevd ] || [ -x /usr/lib/systemd/systemd-udevd ] || [ -x /lib/systemd/systemd-udevd ]; then
    26372637            lis2=`grep -Ev '^#' $DEPLIST_DIR/udev.conf`
    26382638            lis=""
  • branches/3.2/mindi/rootfs/etc/init.d/rcS

    r3484 r3489  
    7474ExtractDevTarballs() {
    7575    cd /
    76     if [ -x /usr/lib/systemd/systemd-udevd ]; then
     76    if [ -x /usr/lib/systemd/systemd-udevd ] || [ -x /lib/systemd/systemd-udevd ]; then
    7777        # Just use vc dev files. The other are useless and create huge delays with LVM
    7878        tar -zxf /vc.tgz || LogIt "Error occurred while extracting /vc.tgz"
     
    384384    mkdir /dev
    385385    # Contributed during LinuxCon Japan !
    386     if [ -x /usr/lib/systemd/systemd-udevd ]; then
     386    if [ -x /usr/lib/systemd/systemd-udevd ] || [ -x /lib/systemd/systemd-udevd ]; then
    387387        mount -n -t devtmpfs none /dev
    388388    else
     
    413413        elif [ -x /usr/bin/udevd ]; then
    414414            /usr/bin/udevd --daemon &
    415         elif [ -x /usr/lib/systemd/systemd-udevd ]; then
     415        elif [ -x /usr/lib/systemd/systemd-udevd ] || [ -x /lib/systemd/systemd-udevd ]; then
    416416            # from https://github.com/hut/minirc/blob/master/rc
    417417            echo "INFO: This is the systemd version of udev"
     
    421421            mkdir -p /run/udev
    422422            mkdir -p /run/systemd/journal
    423             /usr/lib/systemd/systemd-udevd --daemon
     423            if [ -x /usr/lib/systemd/systemd-udevd ]; then
     424                /usr/lib/systemd/systemd-udevd --daemon
     425            else
     426                /lib/systemd/systemd-udevd --daemon
     427            fi
    424428            udevadm trigger --action=add --type=subsystems
    425429            udevadm trigger --action=add --type=devices
Note: See TracChangeset for help on using the changeset viewer.