Merge version 241-6+rpi1 and 241-7 to produce 241-7+rpi1

diff --cc debian/changelog
index 3ca4255c5205d5146cb29b8ff944f0d61769cb32,ce86c4d786b88c24d3cf8cd2737f93c542736c6c..e0fad4618b0ecd493ff8b761bb6b2dceddbac250
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,20 +1,37 @@@
- systemd (241-6+rpi1) bullseye-staging; urgency=medium
++systemd (241-7+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 239-9+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 20 Sep 2018 20:22:45 +0000]
 +  * Disable testsuite, it fails on some of our buildboxes (probablly because of
 +    old kernels).
 +  * Add breaks on raspi-copies-and-fills, it doesn't seem to get on with
 +    this version of systemd/udev.
 +
 +  [changes brought forward from 239-9+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 20 Sep 2018 22:47:19 +0000]
 +  * Force build with gcc-7 (LP: #1793415)
 +
 +  [changes brought forward from 241-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 02 Apr 2019 19:29:26 +0000]
 +  * Bump "breaks" on raspi-copies-and-fills to << 0.12
 +    (raspi-copies-and-fills was reverted by the raspberry pi foundation)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 13 Jul 2019 01:30:09 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 27 Jul 2019 19:10:21 +0000
++
+ systemd (241-7) unstable; urgency=medium
+ 
+   [ Michael Biebl ]
+   * network: Fix failure to bring up interface with Linux kernel 5.2.
+     Backport two patches from systemd master in order to fix a bug with 5.2
+     kernels where the network interface fails to come up with the following
+     error: "enp3s0: Could not bring up interface: Invalid argument"
+     (Closes: #931636)
+   * Use /usr/sbin/nologin as nologin shell.
+     In Debian the nologin shell is installed in /usr/sbin, not /sbin.
+     (Closes: #931850)
+ 
+   [ Mert Dirik ]
+   * 40-systemd: Don't fail if SysV init script uses set -u and $1 is unset
+     (Closes: #931719)
+ 
+  -- Michael Biebl <biebl@debian.org>  Thu, 18 Jul 2019 19:38:23 +0200
  
  systemd (241-6) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge