Merge ~enr0n/ubuntu/+source/systemd:ubuntu-focal into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-focal

[Nick Rosbrook]

PPA autopkgtest results here:

s390x -- Pass: https://autopkgtest.ubuntu.com/results/autopkgtest-focal-enr0n-systemd-245/focal/s390x/s/systemd/20220817_134733_893c0@/log.gz
ppc64el -- Pass: https://autopkgtest.ubuntu.com/results/autopkgtest-focal-enr0n-systemd-245/focal/ppc64el/s/systemd/20220817_141307_73c34@/log.gz
armhf -- Pass: https://autopkgtest.ubuntu.com/results/autopkgtest-focal-enr0n-systemd-245/focal/armhf/s/systemd/20220817_132444_b28e1@/log.gz
arm64 -- Pass: https://autopkgtest.ubuntu.com/results/autopkgtest-focal-enr0n-systemd-245/focal/arm64/s/systemd/20220817_143109_e3923@/log.gz
amd64 -- Pass: https://autopkgtest.ubuntu.com/results/autopkgtest-focal-enr0n-systemd-245/focal/amd64/s/systemd/20220817_145309_349fa@/log.gz

[Lukas Märdian (slyon)]

+1

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 3df1667..23f1212 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ systemd (245.4-4ubuntu3.18) UNRELEASED; urgency=medium
   * network: do not remove localhost address (LP: #1979951)
     File: debian/patches/lp1979951-network-do-not-remove-localhost-address.patch
     https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=87f872b8c5451f353601fb606e7fd7a479217cef
+  * units: remove the restart limit on the modprobe@.service (LP: #1982462)
+    File: debian/patches/lp1982462-units-remove-the-restart-limit-on-the-modprobe-.service.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=68353ffaf3539e6a58ef62a8b50850f56eae29ea
 
   [ Mustafa Kemal Gilor ]
   * d/p/lp1978079-efi-pstore-not-cleared-on-boot.patch: pstore: Run after
@@ -21,7 +24,7 @@ systemd (245.4-4ubuntu3.18) UNRELEASED; urgency=medium
     File: debian/patches/lp1978079-efi-pstore-not-cleared-on-boot.patch
     https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6e60756f2079d6408abdb967127a1d9b9a0eba8c
 
- -- Nick Rosbrook <[e-mail]>  Fri, 22 Jul 2022 15:30:27 -0400
+ -- Nick Rosbrook <[e-mail]>  Tue, 16 Aug 2022 17:52:56 -0400
 
 systemd (245.4-4ubuntu3.17) focal; urgency=medium
 
diff --git a/debian/patches/lp1982462-units-remove-the-restart-limit-on-the-modprobe-.service.patch b/debian/patches/lp1982462-units-remove-the-restart-limit-on-the-modprobe-.service.patch
new file mode 100644
index 0000000..8c05f17
--- /dev/null
+++ b/debian/patches/lp1982462-units-remove-the-restart-limit-on-the-modprobe-.service.patch
@@ -0,0 +1,33 @@
+From: Alban Bedel <[e-mail]>
+Date: Wed, 15 Jun 2022 13:12:46 +0200
+Subject: units: remove the restart limit on the modprobe@.service
+
+Origin: upstream, https://github.com/systemd/systemd/commit/9625350e5381a68c1179ae4581e7586c206663e1
+Bug-Ubuntu: https://launchpad.net/bugs/1982462
+
+They are various cases where the same module might be repeatedly
+loaded in a short time frame, for example if a service depending on a
+module keep restarting, or if many instances of such service get
+started at the same time. If this happend the modprobe@.service
+instance will be marked as failed because it hit the restart limit.
+
+Overall it doesn't seems to make much sense to have a restart limit on
+the modprobe service so just disable it.
+
+Fixes: #23742
+---
+ units/modprobe@.service | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/units/modprobe@.service b/units/modprobe@.service
+index 34a0557..be83b5d 100644
+--- a/units/modprobe@.service
++++ b/units/modprobe@.service
+@@ -14,6 +14,7 @@ Before=sysinit.target
+ Documentation=man:modprobe(8)
+ ConditionCapability=CAP_SYS_MODULE
+ ConditionPathExists=!/sys/module/%I
++StartLimitIntervalSec=0
+ 
+ [Service]
+ Type=oneshot
diff --git a/debian/patches/series b/debian/patches/series
index d1d0127..1796cc6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -179,3 +179,4 @@ lp1959475-core-make-sure-we-don-t-get-confused-when-setting-TERM-fo.patch
 lp1966800-shared-calendarspec-when-mktime-moves-us-backwards-jump-f.patch
 lp1978079-efi-pstore-not-cleared-on-boot.patch
 lp1979951-network-do-not-remove-localhost-address.patch
+lp1982462-units-remove-the-restart-limit-on-the-modprobe-.service.patch