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 | |
parent | Merging upstream version 256. (diff) | |
download | systemd-debian/256-1.tar.xz systemd-debian/256-1.zip |
Adding debian version 256-1.debian/256-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/extra')
16 files changed, 46 insertions, 2 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 diff --git a/debian/extra/limits.d/10-coredump-debian.conf b/debian/extra/limits.d/10-coredump-debian.conf new file mode 100644 index 0000000..b7f9ee5 --- /dev/null +++ b/debian/extra/limits.d/10-coredump-debian.conf @@ -0,0 +1,4 @@ +* soft core 0 +root soft core 0 +* hard core infinity +root hard core infinity diff --git a/debian/extra/limits.d/20-coredump-debian.conf b/debian/extra/limits.d/20-coredump-debian.conf new file mode 100644 index 0000000..199a297 --- /dev/null +++ b/debian/extra/limits.d/20-coredump-debian.conf @@ -0,0 +1,2 @@ +* soft core infinity +root soft core infinity diff --git a/debian/extra/network/73-usb-net-by-mac.link b/debian/extra/network/73-usb-net-by-mac.link index 98800cd..84be343 100644 --- a/debian/extra/network/73-usb-net-by-mac.link +++ b/debian/extra/network/73-usb-net-by-mac.link @@ -1,5 +1,6 @@ [Match] Path=*-usb-* +Property=ID_NET_NAME_MAC=* [Link] NamePolicy=mac diff --git a/debian/extra/resolved.conf.d/cache-no-negative.conf b/debian/extra/resolved.conf.d/cache-no-negative.conf new file mode 100644 index 0000000..92b28fa --- /dev/null +++ b/debian/extra/resolved.conf.d/cache-no-negative.conf @@ -0,0 +1,4 @@ +# Ubuntu defaults to Cache=no-negative. See LP: #1668771. + +[Resolve] +Cache=no-negative diff --git a/debian/extra/sysctl.d/10-coredump-debian.conf b/debian/extra/sysctl.d/10-coredump-debian.conf new file mode 100644 index 0000000..e58fb85 --- /dev/null +++ b/debian/extra/sysctl.d/10-coredump-debian.conf @@ -0,0 +1 @@ +kernel.core_pattern=core diff --git a/debian/extra/system.conf.d/10-coredump-debian.conf b/debian/extra/system.conf.d/10-coredump-debian.conf new file mode 100644 index 0000000..395b155 --- /dev/null +++ b/debian/extra/system.conf.d/10-coredump-debian.conf @@ -0,0 +1,2 @@ +[Manager] +DefaultLimitCORE=0:infinity diff --git a/debian/extra/system.conf.d/20-coredump-debian.conf b/debian/extra/system.conf.d/20-coredump-debian.conf new file mode 100644 index 0000000..c06081d --- /dev/null +++ b/debian/extra/system.conf.d/20-coredump-debian.conf @@ -0,0 +1,2 @@ +[Manager] +DefaultLimitCORE=infinity diff --git a/debian/extra/systemd-oomd-defaults/-.slice.d/10-oomd-root-slice-defaults.conf b/debian/extra/systemd-oomd-defaults/-.slice.d/10-oomd-root-slice-defaults.conf index 49958e8..9862d0f 100644 --- a/debian/extra/systemd-oomd-defaults/-.slice.d/10-oomd-root-slice-defaults.conf +++ b/debian/extra/systemd-oomd-defaults/-.slice.d/10-oomd-root-slice-defaults.conf @@ -1,2 +1,2 @@ [Slice] -ManagedOOMSwap=kill +ManagedOOMSwap=auto diff --git a/debian/extra/tmpfiles.d/debian.conf b/debian/extra/tmpfiles.d/debian.conf index 0f55da0..1877e02 100644 --- a/debian/extra/tmpfiles.d/debian.conf +++ b/debian/extra/tmpfiles.d/debian.conf @@ -10,6 +10,7 @@ # Type Path Mode UID GID Age Argument L /run/shm - - - - /dev/shm d /run/sendsigs.omit.d 0755 root root - +d /run/lock 1777 root root - - L+ /etc/mtab - - - - ../proc/self/mounts L+ /etc/default/locale - - - - ../locale.conf diff --git a/debian/extra/units-ubuntu/systemd-journald.service.d/nice.conf b/debian/extra/units-ubuntu/systemd-journald.service.d/nice.conf new file mode 100644 index 0000000..774e847 --- /dev/null +++ b/debian/extra/units-ubuntu/systemd-journald.service.d/nice.conf @@ -0,0 +1,4 @@ +# Set Nice=-1 to dodge watchdog on soft lockups (LP: #1696970). + +[Service] +Nice=-1 diff --git a/debian/extra/units/run-lock.mount b/debian/extra/units/run-lock.mount new file mode 100644 index 0000000..8d22dd9 --- /dev/null +++ b/debian/extra/units/run-lock.mount @@ -0,0 +1,14 @@ +[Unit] +Description=Legacy Locks Directory /run/lock +DefaultDependencies=no +Conflicts=umount.target +Before=local-fs.target umount.target + +[Mount] +Type=tmpfs +What=tmpfs +Where=/run/lock +Options=mode=1777,nosuid,nodev,noexec,size=5242880 + +[Install] +WantedBy=local-fs.target diff --git a/debian/extra/units/systemd-fsck-root.service.d/10-skip-fsck-initramfs.conf b/debian/extra/units/systemd-fsck-root.service.d/10-skip-fsck-initramfs.conf new file mode 100644 index 0000000..4d26175 --- /dev/null +++ b/debian/extra/units/systemd-fsck-root.service.d/10-skip-fsck-initramfs.conf @@ -0,0 +1,2 @@ +[Unit] +ConditionPathExists=!/run/initramfs/fsck-root diff --git a/debian/extra/user.conf.d/10-coredump-debian.conf b/debian/extra/user.conf.d/10-coredump-debian.conf new file mode 100644 index 0000000..395b155 --- /dev/null +++ b/debian/extra/user.conf.d/10-coredump-debian.conf @@ -0,0 +1,2 @@ +[Manager] +DefaultLimitCORE=0:infinity diff --git a/debian/extra/user.conf.d/20-coredump-debian.conf b/debian/extra/user.conf.d/20-coredump-debian.conf new file mode 100644 index 0000000..c06081d --- /dev/null +++ b/debian/extra/user.conf.d/20-coredump-debian.conf @@ -0,0 +1,2 @@ +[Manager] +DefaultLimitCORE=infinity |