udev-rules: Pre usrmove systemd installs might not find udevd.

If users had switched to systemd-183+ but have not completed
the usrmove, then the variable ${systemdutildir} will likely
refer to /usr/lib/systemd NOT /lib/systemd and thus the
systemd-udevd daemon may not be found.

So let's try a little harder and add another hard coded path
and if we don't find it, then bail out hard.
master
Colin Guthrie 2012-08-16 14:27:22 +01:00 committed by Harald Hoyer
parent 68c49db952
commit f9452c94c0
1 changed files with 5 additions and 1 deletions

View File

@ -12,7 +12,7 @@ install() {
/etc/udev/udev.conf /etc/group

[ -d ${initdir}/lib/systemd ] || mkdir -p ${initdir}/lib/systemd
for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /sbin/udevd; do
for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /lib/systemd/systemd-udevd /sbin/udevd; do
[ -x "$_i" ] || continue
inst "$_i"

@ -21,6 +21,10 @@ install() {
fi
break
done
if ! [[ -e ${initdir}/lib/systemd/systemd-udevd ]]; then
derror "Cannot find [systemd-]udevd binary!"
exit 1
fi

inst_rules 50-udev-default.rules 60-persistent-storage.rules \
61-persistent-storage-edd.rules 80-drivers.rules 95-udev-late.rules \