Skip to content

Commit 64ca45b

Browse files
committed
systemd: migrate mount-rate patch to bootconfig
Move 9007-core-mount-increase-mount-rate-limit-burst-to-25.patch to use the `SYSTEMD_DEFAULT_MOUNT_RATE_LIMIT_BURST` env variable instead. Using bootconfig allows us to set this as a default fot all variants without changing the variant definitions. Signed-off-by: Vighnesh Maheshwari <[email protected]>
1 parent af802e6 commit 64ca45b

7 files changed

+12
-38
lines changed

packages/systemd-257/9007-core-mount-increase-mount-rate-limit-burst-to-25.patch

Lines changed: 0 additions & 29 deletions
This file was deleted.

packages/systemd-257/systemd-257.spec

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ License: GPL-2.0-or-later AND GPL-2.0-only AND LGPL-2.1-or-later
1111
URL: https://www.freedesktop.org/wiki/Software/systemd
1212
Source0: https://github.com/systemd/systemd/archive/v%{version}/systemd-%{version}.tar.gz
1313

14+
Source1: systemd-mount-rate-bootconfig.conf
1415

1516
# Local patch to add the acquire the id for VMware
1617
Patch9001: 9001-machine-id-setup-generate-stable-ID-under-VM.patch
@@ -31,25 +32,20 @@ Patch9005: 9005-sysusers-set-root-shell-to-sbin-nologin.patch
3132
# DBUS services not used in Bottlerocket
3233
Patch9006: 9006-systemd-networkd-Conditionalize-hostnamed-timezoned-.patch
3334

34-
# Local patch to adjust the default mount rate limit to 25 per second.
35-
# Carried as a patch so that SYSTEMD_DEFAULT_MOUNT_RATE_LIMIT_BURST can be used
36-
# as a kernel command line parameter to override.
37-
Patch9007: 9007-core-mount-increase-mount-rate-limit-burst-to-25.patch
38-
3935
# Local patch to work around a potentially non-compliant Option 15 in the DHCP
4036
# lease in EC2.
41-
Patch9008: 9008-sd-dhcp-lease-parse-multiple-domains-in-option-15.patch
37+
Patch9007: 9007-sd-dhcp-lease-parse-multiple-domains-in-option-15.patch
4238

4339
# Local patch to allow resolving .local domains
44-
Patch9009: 9009-allow-lookups-of-local-domains-using-unicast-DNS.patch
40+
Patch9008: 9008-allow-lookups-of-local-domains-using-unicast-DNS.patch
4541

4642
# Do not enable OpenSSL for systemd-dissect, since AWS-LC doesn't support the
4743
# PKCS7_verify function it wants.
48-
Patch9010: 9010-dissect-image-disable-openssl-support.patch
44+
Patch9009: 9009-dissect-image-disable-openssl-support.patch
4945

5046
# Have pkgconfig find "libcrypto.pc" instead of "openssl.pc" to avoid the
5147
# unneeded dependency on libssl.
52-
Patch9011: 9011-meson-replace-openssl-dependency-with-libcrypto.patch
48+
Patch9010: 9010-meson-replace-openssl-dependency-with-libcrypto.patch
5349

5450
BuildRequires: gperf
5551
BuildRequires: intltool
@@ -310,6 +306,9 @@ ln -s ../proc-sys-fs-binfmt_misc.mount \
310306
# Remove any README files.
311307
find %{buildroot} -type f -name README -print -delete
312308

309+
install -d %{buildroot}%{_cross_bootconfigdir}
310+
install -p -m 0644 %{S:1} %{buildroot}%{_cross_bootconfigdir}/20-mount-rate-limit-burst.conf
311+
313312
%files
314313
%license LICENSE.GPL2 LICENSE.LGPL2.1
315314
%{_cross_attribution_file}
@@ -403,6 +402,9 @@ find %{buildroot} -type f -name README -print -delete
403402
%{_cross_sysctldir}/50-default.conf
404403
%{_cross_sysctldir}/50-pid-max.conf
405404

405+
%dir %{_cross_bootconfigdir}
406+
%{_cross_bootconfigdir}/20-mount-rate-limit-burst.conf
407+
406408
%dir %{_cross_unitdir}
407409
%{_cross_unitdir}/basic.target
408410
%{_cross_unitdir}/[email protected]
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
kernel.SYSTEMD_DEFAULT_MOUNT_RATE_LIMIT_BURST=25

0 commit comments

Comments
 (0)