Remove obsolete support for configurable udev root

Upstream has removed support for a configurable UDEV_ROOT in udev 176
when devtmpfs became mandatory. We already removed this from the SysV
init script in commit dbad4c2a8dcd69e310de897daf8eb150bdcec249.

diff --git a/debian/extra/initramfs.bottom b/debian/extra/initramfs.bottom
index 375dfab7d73dabde8ae92366e97c656555f25ea5..ff99edc015aa361439d6bb0f296d130eaac559e9 100644 (file)
--- a/debian/extra/initramfs.bottom
+++ b/debian/extra/initramfs.bottom
@@ -14,15 +14,10 @@ esac
 # Stop udevd, we'll miss a few events while we run init, but we catch up
 udevadm control --exit
 
-udev_root="/dev"
-if [ -e /etc/udev/udev.conf ]; then
-  . /etc/udev/udev.conf
-fi
-
 # move the /dev tmpfs to the rootfs
-mount -n -o move /dev ${rootmnt}${udev_root}
+mount -n -o move /dev ${rootmnt}/dev
 
 # create a temporary symlink to the final /dev for other initramfs scripts
 nuke /dev
-ln -s ${rootmnt}${udev_root} /dev
+ln -s ${rootmnt}/dev /dev
 

diff --git a/debian/extra/initramfs.top b/debian/extra/initramfs.top
index be879a69a6c4b35defde3bac7ac7379d7709abb7..9e2cbb8ecdf8b542de01bae86d409660cad08c34 100644 (file)
--- a/debian/extra/initramfs.top
+++ b/debian/extra/initramfs.top
@@ -13,7 +13,6 @@ esac
 
 echo > /sys/kernel/uevent_helper
 
-UDEV_ROOT=/dev \
 /lib/systemd/systemd-udevd --daemon --resolve-names=never
 
 udevadm trigger --action=add