diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 03:50:44 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 03:50:44 +0000 |
commit | 5c4ff5cee2b18c18b315c8887ab60e5b7940ae0b (patch) | |
tree | 52c412d94cd9319af800bb1ddda8d906136fbd0a /debian/extra/initramfs-tools | |
parent | Merging upstream version 256. (diff) | |
download | systemd-5c4ff5cee2b18c18b315c8887ab60e5b7940ae0b.tar.xz systemd-5c4ff5cee2b18c18b315c8887ab60e5b7940ae0b.zip |
Adding debian version 256-1.debian/256-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/extra/initramfs-tools')
-rwxr-xr-x | debian/extra/initramfs-tools/hooks/udev | 2 | ||||
-rwxr-xr-x | debian/extra/initramfs-tools/scripts/init-bottom/udev | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/extra/initramfs-tools/hooks/udev b/debian/extra/initramfs-tools/hooks/udev index d45a287..2ad482a 100755 --- a/debian/extra/initramfs-tools/hooks/udev +++ b/debian/extra/initramfs-tools/hooks/udev @@ -17,7 +17,7 @@ mkdir -p "$DESTDIR/usr/lib/systemd" copy_exec /usr/lib/systemd/systemd-udevd /usr/lib/systemd copy_exec /usr/bin/udevadm /usr/bin # libkmod is loaded via dlopen() since v256 so pull it in manually -for library in usr/lib/*/libkmod.so.*; do +for library in /usr/lib/*/libkmod.so.*; do if [ -f "${library}" ]; then copy_exec "${library}" fi diff --git a/debian/extra/initramfs-tools/scripts/init-bottom/udev b/debian/extra/initramfs-tools/scripts/init-bottom/udev index 73887ea..cb114b7 100755 --- a/debian/extra/initramfs-tools/scripts/init-bottom/udev +++ b/debian/extra/initramfs-tools/scripts/init-bottom/udev @@ -12,6 +12,9 @@ case "$1" in esac # Stop udevd, we'll miss a few events while we run init, but we catch up +# Wait for current workers to stop (at most for a minute to avoid deadlocks) +# otherwise there will be lock files left under /run/ (see: #1056564) +udevadm settle --timeout=60 udevadm control --exit # move the /dev tmpfs to the rootfs; fall back to util-linux mount that does |