Your message dated Sat, 10 Nov 2018 10:42:56 +0000
with message-id <1541846576.3542.38.ca...@adam-barratt.org.uk>
and subject line Closing bugs for updates included in 9.6
has caused the Debian Bug report #908913,
regarding stretch-pu: package systemd/232-25+deb9u5
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
908913: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908913
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian....@packages.debian.org
Usertags: pu

Hi,

I'd like to make a stable upload for systemd, fixing #901834:
systemd-networkd fails to start the network service because of race
condition to dbus
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901834

Full debdiff is attached, the changelog reads

systemd (232-25+deb9u5) stretch; urgency=medium

  * networkd: Do not fail manager_connect_bus() if dbus is not active yet
    (Closes: #901834)

 -- Michael Biebl <bi...@debian.org>  Sat, 15 Sep 2018 21:40:38 +0200


The issue is fixed in sid/buster, the patches are cherry-picks from
upstream.

The changes don't touch udev, i.e. d-i, that said, I've kibi for his
ack.

Regards,
Michael

-- System Information:
Debian Release: buster/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), 
LANGUAGE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff --git a/debian/changelog b/debian/changelog
index a81c855..740787b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+systemd (232-25+deb9u5) stretch; urgency=medium
+
+  * networkd: Do not fail manager_connect_bus() if dbus is not active yet
+    (Closes: #901834)
+
+ -- Michael Biebl <bi...@debian.org>  Sat, 15 Sep 2018 21:40:38 +0200
+
 systemd (232-25+deb9u4) stretch; urgency=medium
 
   * core/load-fragment: Add RemoveIPC=
diff --git 
a/debian/patches/network-resolve-remove-comments-related-to-kdbus.patch 
b/debian/patches/network-resolve-remove-comments-related-to-kdbus.patch
new file mode 100644
index 0000000..2da2e1c
--- /dev/null
+++ b/debian/patches/network-resolve-remove-comments-related-to-kdbus.patch
@@ -0,0 +1,38 @@
+From: Yu Watanabe <watanabe.yu+git...@gmail.com>
+Date: Wed, 23 Aug 2017 12:38:56 +0900
+Subject: network,resolve: remove comments related to kdbus
+
+(cherry picked from commit d7ea7bb8a8da9f94d8fbc5be2c5c4b2ebe40b7b3)
+---
+ src/network/networkd-manager.c | 3 +--
+ src/resolve/resolved-bus.c     | 3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
+index 360677d..681fe0b 100644
+--- a/src/network/networkd-manager.c
++++ b/src/network/networkd-manager.c
+@@ -138,8 +138,7 @@ int manager_connect_bus(Manager *m) {
+         r = sd_bus_default_system(&m->bus);
+         if (r < 0) {
+                 /* We failed to connect? Yuck, we must be in early
+-                 * boot. Let's try in 5s again. As soon as we have
+-                 * kdbus we can stop doing this... */
++                 * boot. Let's try in 5s again. */
+ 
+                 log_debug_errno(r, "Failed to connect to bus, trying again in 
5s: %m");
+ 
+diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c
+index 2ca65e6..f53324a 100644
+--- a/src/resolve/resolved-bus.c
++++ b/src/resolve/resolved-bus.c
+@@ -1641,8 +1641,7 @@ int manager_connect_bus(Manager *m) {
+         r = sd_bus_default_system(&m->bus);
+         if (r < 0) {
+                 /* We failed to connect? Yuck, we must be in early
+-                 * boot. Let's try in 5s again. As soon as we have
+-                 * kdbus we can stop doing this... */
++                 * boot. Let's try in 5s again. */
+ 
+                 log_debug_errno(r, "Failed to connect to bus, trying again in 
5s: %m");
+ 
diff --git 
a/debian/patches/networkd-do-not-fail-manager_connect_bus-if-dbus-is-not-a.patch
 
b/debian/patches/networkd-do-not-fail-manager_connect_bus-if-dbus-is-not-a.patch
new file mode 100644
index 0000000..6be5a48
--- /dev/null
+++ 
b/debian/patches/networkd-do-not-fail-manager_connect_bus-if-dbus-is-not-a.patch
@@ -0,0 +1,25 @@
+From: Yu Watanabe <watanabe.yu+git...@gmail.com>
+Date: Wed, 23 Aug 2017 12:36:36 +0900
+Subject: networkd: do not fail manager_connect_bus() if dbus is not active
+ yet
+
+Fixes #6618.
+
+(cherry picked from commit fb72b1d99f661ea62fd534e4bc1174c6337611c8)
+---
+ src/network/networkd-manager.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
+index 9174dcc..360677d 100644
+--- a/src/network/networkd-manager.c
++++ b/src/network/networkd-manager.c
+@@ -136,7 +136,7 @@ int manager_connect_bus(Manager *m) {
+         assert(m);
+ 
+         r = sd_bus_default_system(&m->bus);
+-        if (r == -ENOENT) {
++        if (r < 0) {
+                 /* We failed to connect? Yuck, we must be in early
+                  * boot. Let's try in 5s again. As soon as we have
+                  * kdbus we can stop doing this... */
diff --git a/debian/patches/series b/debian/patches/series
index 8252799..3c1ebbe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -83,6 +83,8 @@ core-load-fragment-add-RemoveIPC-7288.patch
 nspawn-add-missing-E-to-getopt_long-4860.patch
 login-change-variable-type-of-enable_wall_messages-as-it-.patch
 login-do-not-wall-message-on-cancelling-shutdown-when-Man.patch
+networkd-do-not-fail-manager_connect_bus-if-dbus-is-not-a.patch
+network-resolve-remove-comments-related-to-kdbus.patch
 debian/Use-Debian-specific-config-files.patch
 debian/don-t-try-to-start-autovt-units-when-not-running-wit.patch
 debian/Make-logind-hostnamed-localed-timedated-D-Bus-activa.patch

--- End Message ---
--- Begin Message ---
Version: 9.6

Hi,

The update referenced by each of these bugs was included in this
morning's stretch point release.

Regards,

Adam

--- End Message ---

Reply via email to