mirror of
https://git.proxmox.com/git/systemd
synced 2026-01-09 11:36:28 +00:00
udev.init: drop experimental support for "$udev_root" != "/dev"
This commit is contained in:
parent
c4671ce831
commit
dbad4c2a8d
109
debian/udev.init
vendored
109
debian/udev.init
vendored
@ -140,115 +140,6 @@ if [ -d /sys/class/mem/null -a ! -L /sys/class/mem/null ] || \
|
||||
sleep 30
|
||||
fi
|
||||
|
||||
##############################################################################
|
||||
|
||||
# this is experimental and may not work well
|
||||
if [ "$UDEV_DISABLED" = "yes" ]; then
|
||||
udev_root=/etc/udev/.dev
|
||||
export UDEV_ROOT=$udev_root
|
||||
fi
|
||||
|
||||
udev_root=${udev_root%/}
|
||||
|
||||
dev_mount_options='mode=0755'
|
||||
if [ "$tmpfs_size" ]; then
|
||||
dev_mount_options="size=${tmpfs_size},${dev_mount_options}"
|
||||
fi
|
||||
|
||||
if [ "$udev_root" != "/dev" ]; then
|
||||
log_warning_msg "udev_root != /dev/"
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
if init_is_upstart 2>/dev/null; then
|
||||
exit 1
|
||||
fi
|
||||
if mountpoint -q $udev_root/; then
|
||||
log_failure_msg "$udev_root is already mounted"
|
||||
log_end_msg 1
|
||||
fi
|
||||
|
||||
echo > /sys/kernel/uevent_helper
|
||||
|
||||
mount -n -o $dev_mount_options -t tmpfs tmpfs $udev_root
|
||||
|
||||
log_daemon_msg "Starting the hotplug events dispatcher" "udevd"
|
||||
if udevd --daemon; then
|
||||
log_end_msg $?
|
||||
else
|
||||
log_warning_msg $?
|
||||
log_warning_msg "Waiting 15 seconds and trying to continue anyway"
|
||||
sleep 15
|
||||
fi
|
||||
|
||||
log_action_begin_msg "Synthesizing the initial hotplug events"
|
||||
if udevadm trigger --action=add; then
|
||||
log_action_end_msg $?
|
||||
else
|
||||
log_action_end_msg $?
|
||||
fi
|
||||
|
||||
;;
|
||||
stop)
|
||||
# make sure a manual invocation of the init script doesn't stop an
|
||||
# upstart-controlled instance of udev
|
||||
if init_is_upstart 2>/dev/null && status udev | grep -q start; then
|
||||
exit 0
|
||||
fi
|
||||
log_daemon_msg "Stopping the hotplug events dispatcher" "udevd"
|
||||
if start-stop-daemon --stop --name udevd --user root --quiet --oknodo --retry 5; then
|
||||
log_end_msg $?
|
||||
else
|
||||
log_end_msg $?
|
||||
fi
|
||||
|
||||
log_action_begin_msg "Unmounting $udev_root"
|
||||
# unmounting with -l should never fail
|
||||
if umount -n -l $udev_root; then
|
||||
log_action_end_msg $?
|
||||
else
|
||||
log_action_end_msg $?
|
||||
fi
|
||||
;;
|
||||
|
||||
restart)
|
||||
if init_is_upstart 2>/dev/null; then
|
||||
exit 1
|
||||
fi
|
||||
log_daemon_msg "Stopping the hotplug events dispatcher" "udevd"
|
||||
if start-stop-daemon --stop --name udevd --user root --quiet --oknodo --retry 5; then
|
||||
log_end_msg $?
|
||||
else
|
||||
log_end_msg $? || true
|
||||
fi
|
||||
|
||||
log_daemon_msg "Starting the hotplug events dispatcher" "udevd"
|
||||
if udevd --daemon; then
|
||||
log_end_msg $?
|
||||
else
|
||||
log_end_msg $?
|
||||
fi
|
||||
;;
|
||||
|
||||
reload|force-reload)
|
||||
udevadm control --reload-rules
|
||||
;;
|
||||
|
||||
status)
|
||||
status_of_proc /sbin/udevd udevd && exit 0 || exit $?
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "Usage: /etc/init.d/udev {start|stop|restart|reload|force-reload|status}" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
fi # udev_root != /dev
|
||||
|
||||
##############################################################################
|
||||
|
||||
# When modifying this script, do not forget that between the time that the
|
||||
# new /dev has been mounted and udevadm trigger has been run there will be
|
||||
# no /dev/null. This also means that you cannot use the "&" shell command.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user