NEWS

@@ -71,13 +71,6 @@ CHANGES WITH 251:
           (as exposed via the SystemCallFilter= setting in service unit files).
           It is apparently used by the linker now.
 
-        * The tmpfiles entries that create the /run/systemd/netif directory and
-          its subdirectories were moved from tmpfiles.d/systemd.conf to
-          tmpfiles.d/systemd-network.conf.
-
-          Users might need to adjust their files that override tmpfiles.d/systemd.conf
-          to account for this change.
-
         Changes in the Boot Loader Specification, kernel-install and sd-boot:
 
         * kernel-install's and bootctl's Boot Loader Specification Type #1

hwdb.d/60-keyboard.hwdb

@@ -699,10 +699,6 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP:pnHPEliteBookFolioG1:*
  KEYBOARD_KEY_64=calendar
  KEYBOARD_KEY_81=f20
 
-# HP EliteBook 845 G7
-evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook845G7*:pvr*
- KEYBOARD_KEY_68=unknown                                # Fn+F12 HP Programmable Key
-
 # HP ProBook 650
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHP*ProBook*650*:*
  KEYBOARD_KEY_f8=wlan                                   # Wireless HW switch button

src/libsystemd/sd-network/sd-network.c

@@ -413,25 +413,25 @@ static sd_network_monitor* FD_TO_MONITOR(int fd) {
 }
 
 static int monitor_add_inotify_watch(int fd) {
-        int wd;
+        int k;
 
-        wd = inotify_add_watch(fd, "/run/systemd/netif/links/", IN_MOVED_TO|IN_DELETE);
-        if (wd >= 0)
-                return wd;
+        k = inotify_add_watch(fd, "/run/systemd/netif/links/", IN_MOVED_TO|IN_DELETE);
+        if (k >= 0)
+                return 0;
         else if (errno != ENOENT)
                 return -errno;
 
-        wd = inotify_add_watch(fd, "/run/systemd/netif/", IN_CREATE|IN_ISDIR);
-        if (wd >= 0)
-                return wd;
+        k = inotify_add_watch(fd, "/run/systemd/netif/", IN_CREATE|IN_ISDIR);
+        if (k >= 0)
+                return 0;
         else if (errno != ENOENT)
                 return -errno;
 
-        wd = inotify_add_watch(fd, "/run/systemd/", IN_CREATE|IN_ISDIR);
-        if (wd < 0)
+        k = inotify_add_watch(fd, "/run/systemd/", IN_CREATE|IN_ISDIR);
+        if (k < 0)
                 return -errno;
 
-        return wd;
+        return 0;
 }
 
 int sd_network_monitor_new(sd_network_monitor **m, const char *category) {
@@ -470,7 +470,7 @@ sd_network_monitor* sd_network_monitor_unref(sd_network_monitor *m) {
 int sd_network_monitor_flush(sd_network_monitor *m) {
         union inotify_event_buffer buffer;
         ssize_t l;
-        int fd;
+        int fd, k;
 
         assert_return(m, -EINVAL);
 
@@ -486,16 +486,13 @@ int sd_network_monitor_flush(sd_network_monitor *m) {
 
         FOREACH_INOTIFY_EVENT(e, buffer, l) {
                 if (e->mask & IN_ISDIR) {
-                        int wd;
+                        k = monitor_add_inotify_watch(fd);
+                        if (k < 0)
+                                return k;
 
-                        wd = monitor_add_inotify_watch(fd);
-                        if (wd < 0)
-                                return wd;
-
-                        if (wd != e->wd) {
-                                if (inotify_rm_watch(fd, e->wd) < 0)
-                                        return -errno;
-                        }
+                        k = inotify_rm_watch(fd, e->wd);
+                        if (k < 0)
+                                return -errno;
                 }
         }
 

test/test-functions

@@ -752,17 +752,17 @@ install_valgrind() {
 
     local valgrind_bins valgrind_libs valgrind_dbg_and_supp
 
-    readarray -t valgrind_bins < <(strace -e execve valgrind /bin/true 2>&1 >/dev/null | perl -lne 'print $1 if /^execve\("([^"]+)"/')
-    image_install "${valgrind_bins[@]}"
+    valgrind_bins="$(strace -e execve valgrind /bin/true 2>&1 >/dev/null | perl -lne 'print $1 if /^execve\("([^"]+)"/')"
+    image_install "$valgrind_bins"
 
-    readarray -t valgrind_libs < <(LD_DEBUG=files valgrind /bin/true 2>&1 >/dev/null | perl -lne 'print $1 if m{calling init: (/.*vgpreload_.*)}')
-    image_install "${valgrind_libs[@]}"
+    valgrind_libs="$(LD_DEBUG=files valgrind /bin/true 2>&1 >/dev/null | perl -lne 'print $1 if m{calling init: (/.*vgpreload_.*)}')"
+    image_install "$valgrind_libs"
 
-    readarray -t valgrind_dbg_and_supp < <(
+    valgrind_dbg_and_supp="$(
         strace -e open valgrind /bin/true 2>&1 >/dev/null |
         perl -lne 'if (my ($fname) = /^open\("([^"]+).*= (?!-)\d+/) { print $fname if $fname =~ /debug|\.supp$/ }'
-    )
-    image_install "${valgrind_dbg_and_supp[@]}"
+    )"
+    image_install "$valgrind_dbg_and_supp"
 }
 
 create_valgrind_wrapper() {
@@ -772,7 +772,7 @@ create_valgrind_wrapper() {
 #!/usr/bin/env bash
 
 mount -t proc proc /proc
-exec valgrind --leak-check=full --track-fds=yes --log-file=/valgrind.out $ROOTLIBDIR/systemd "\$@"
+exec valgrind --leak-check=full --log-file=/valgrind.out $ROOTLIBDIR/systemd "\$@"
 EOF
     chmod 0755 "$valgrind_wrapper"
 }

tmpfiles.d/meson.build

@@ -5,13 +5,12 @@ enable_tmpfiles = conf.get('ENABLE_TMPFILES') == 1
 files = [['README',               ''],
          ['home.conf',            ''],
          ['journal-nocow.conf',   ''],
-         ['portables.conf',       'ENABLE_PORTABLED'],
-         ['systemd-network.conf', 'ENABLE_NETWORKD'],
          ['systemd-nologin.conf', 'HAVE_PAM'],
          ['systemd-nspawn.conf',  'ENABLE_MACHINED'],
-         ['systemd-pstore.conf',  'ENABLE_PSTORE'],
          ['systemd-resolve.conf', 'ENABLE_RESOLVE'],
          ['systemd-tmp.conf',     ''],
+         ['portables.conf',       'ENABLE_PORTABLED'],
+         ['systemd-pstore.conf',  'ENABLE_PSTORE'],
          ['tmp.conf',             ''],
          ['x11.conf',             ''],
         ]

tmpfiles.d/systemd-network.conf

@@ -1,13 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-# See tmpfiles.d(5) for details
-
-d /run/systemd/netif 0755 systemd-network systemd-network -
-d /run/systemd/netif/links 0755 systemd-network systemd-network -
-d /run/systemd/netif/leases 0755 systemd-network systemd-network -
-d /run/systemd/netif/lldp 0755 systemd-network systemd-network -

tmpfiles.d/systemd.conf.in

@@ -18,6 +18,12 @@ d /run/systemd/sessions 0755 root root -
 d /run/systemd/users 0755 root root -
 d /run/systemd/machines 0755 root root -
 d /run/systemd/shutdown 0755 root root -
+{% if ENABLE_NETWORKD %}
+d /run/systemd/netif 0755 systemd-network systemd-network -
+d /run/systemd/netif/links 0755 systemd-network systemd-network -
+d /run/systemd/netif/leases 0755 systemd-network systemd-network -
+d /run/systemd/netif/lldp 0755 systemd-network systemd-network -
+{% endif %}
 
 d /run/log 0755 root root -