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

[Balint Reczey]

[Dan Streetman (ddstreet)]

lgtm

review: Approve

diff --git a/debian/patches/series b/debian/patches/series
index 1eea8ff..da98bb1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,6 +11,7 @@ units-drop-systemd-remount-fs.service-dependency-from-mor.patch
 units-make-sure-systemd-pstore-stops-at-shutdown.patch
 network-do-not-re-attach-sd-event-object.patch
 network-attach-sd-event-in-link_load-when-creating-link-d.patch
+shared-Don-t-try-calling-NULL-callback-in-bus_wait_for_un.patch
 debian/Use-Debian-specific-config-files.patch
 debian/Bring-tmpfiles.d-tmp.conf-in-line-with-Debian-defaul.patch
 debian/Make-run-lock-tmpfs-an-API-fs.patch
diff --git a/debian/patches/shared-Don-t-try-calling-NULL-callback-in-bus_wait_for_un.patch b/debian/patches/shared-Don-t-try-calling-NULL-callback-in-bus_wait_for_un.patch
new file mode 100644
index 0000000..af8d7ba
--- /dev/null
+++ b/debian/patches/shared-Don-t-try-calling-NULL-callback-in-bus_wait_for_un.patch
@@ -0,0 +1,24 @@
+From: Balint Reczey <[e-mail]>
+Date: Wed, 22 Apr 2020 09:51:53 +0200
+Subject: shared: Don't try calling NULL callback in bus_wait_for_units_clear
+
+BugLink: https://bugs.launchpad.net/bugs/1870930
+(cherry picked from commit 16d14b4474243f6e06db579582c1fb1bcd13131b)
+---
+ src/shared/bus-wait-for-units.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/shared/bus-wait-for-units.c b/src/shared/bus-wait-for-units.c
+index 78b2a60..ed0442f 100644
+--- a/src/shared/bus-wait-for-units.c
++++ b/src/shared/bus-wait-for-units.c
+@@ -91,7 +91,8 @@ static void bus_wait_for_units_clear(BusWaitForUnits *d) {
+         while ((item = hashmap_first(d->items))) {
+                 d->current = item;
+ 
+-                item->unit_callback(d, item->bus_path, false, item->userdata);
++                if (item->unit_callback)
++                        item->unit_callback(d, item->bus_path, false, item->userdata);
+                 wait_for_item_free(item);
+         }
+