src/basic/meson.build

@@ -235,8 +235,6 @@ basic_sources = files('''
         strv.h
         strxcpyx.c
         strxcpyx.h
-        sysctl-util.c
-        sysctl-util.h
         syslog-util.c
         syslog-util.h
         terminal-util.c

src/basic/socket-util.c

@@ -31,7 +31,6 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"
-#include "sysctl-util.h"
 #include "user-util.h"
 #include "utf8.h"
 
@@ -278,48 +277,10 @@ const char* socket_address_get_path(const SocketAddress *a) {
 }
 
 bool socket_ipv6_is_supported(void) {
-        static int cached = -1;
+        if (access("/proc/net/if_inet6", F_OK) != 0)
-
-        if (cached < 0) {
-
-                if (access("/proc/net/if_inet6", F_OK) < 0) {
-
-                        if (errno != ENOENT) {
-                                log_debug_errno(errno, "Unexpected error when checking whether /proc/net/if_inet6 exists: %m");
-                                return false;
-                        }
-
-                        cached = false;
-                } else
-                        cached = true;
-        }
-
-        return cached;
-}
-
-bool socket_ipv6_is_enabled(void) {
-        _cleanup_free_ char *v;
-        int r;
-
-        /* Much like socket_ipv6_is_supported(), but also checks that the sysctl that disables IPv6 on all
-         * interfaces isn't turned on */
-
-        if (!socket_ipv6_is_supported())
                 return false;
 
-        r = sysctl_read_ip_property(AF_INET6, "all", "disable_ipv6", &v);
+        return true;
-        if (r < 0) {
-                log_debug_errno(r, "Unexpected error reading 'net.ipv6.conf.all.disable_ipv6' sysctl: %m");
-                return true;
-        }
-
-        r = parse_boolean(v);
-        if (r < 0) {
-                log_debug_errno(r, "Failed to pare 'net.ipv6.conf.all.disable_ipv6' sysctl: %m");
-                return true;
-        }
-
-        return !r;
 }
 
 bool socket_address_matches_fd(const SocketAddress *a, int fd) {
@@ -775,11 +736,6 @@ bool ifname_valid_full(const char *p, IfnameValidFlags flags) {
         if (dot_or_dot_dot(p))
                 return false;
 
-        /* Let's refuse "all" and "default" as interface name, to avoid collisions with the special sysctl
-         * directories /proc/sys/net/{ipv4,ipv6}/conf/{all,default} */
-        if (STR_IN_SET(p, "all", "default"))
-                return false;
-
         for (const char *t = p; *t; t++) {
                 if ((unsigned char) *t >= 127U)
                         return false;

src/basic/socket-util.h

@@ -101,7 +101,6 @@ bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) _pure_
 const char* socket_address_get_path(const SocketAddress *a);
 
 bool socket_ipv6_is_supported(void);
-bool socket_ipv6_is_enabled(void);
 
 int sockaddr_port(const struct sockaddr *_sa, unsigned *port);
 const union in_addr_union *sockaddr_in_addr(const struct sockaddr *sa);

src/fstab-generator/fstab-generator.c

@@ -423,7 +423,7 @@ static int add_mount(
                  * mount.nfs (so systemd can manage the job-control aspects of 'bg'),
                  * we need to explicitly preserve that default, and also ensure
                  * the systemd mount-timeout doesn't interfere.
-                 * By placing these options first, they can be overridden by
+                 * By placing these options first, they can be over-ridden by
                  * settings in /etc/fstab. */
                 opts = strjoina("x-systemd.mount-timeout=infinity,retry=10000,nofail,", opts, ",fg");
                 SET_FLAG(flags, NOFAIL, true);
@@ -699,9 +699,9 @@ static int add_sysroot_mount(void) {
                 if (!what)
                         return log_oom();
 
-                fstype = arg_root_fstype ?: "tmpfs"; /* tmpfs, unless overridden */
+                fstype = arg_root_fstype ?: "tmpfs"; /* tmpfs, unless overriden */
 
-                default_rw = true; /* writable, unless overridden */;
+                default_rw = true; /* writable, unless overriden */;
         } else {
 
                 what = fstab_node_to_udev_node(arg_root_what);
@@ -710,7 +710,7 @@ static int add_sysroot_mount(void) {
 
                 fstype = arg_root_fstype; /* if not specified explicitly, don't default to anything here */
 
-                default_rw = false; /* read-only, unless overridden */
+                default_rw = false; /* read-only, unless overriden */
         }
 
         if (!arg_root_options)

src/resolve/resolved-dns-synthesize.c

@@ -81,7 +81,7 @@ static int synthesize_localhost_rr(Manager *m, const DnsResourceKey *key, int if
                         return r;
         }
 
-        if (IN_SET(key->type, DNS_TYPE_AAAA, DNS_TYPE_ANY) && socket_ipv6_is_enabled()) {
+        if (IN_SET(key->type, DNS_TYPE_AAAA, DNS_TYPE_ANY)) {
                 _cleanup_(dns_resource_record_unrefp) DnsResourceRecord *rr = NULL;
 
                 rr = dns_resource_record_new_full(DNS_CLASS_IN, DNS_TYPE_AAAA, dns_resource_key_name(key));
@@ -234,7 +234,7 @@ static int synthesize_system_hostname_rr(Manager *m, const DnsResourceKey *key,
                                         .address.in.s_addr = htobe32(0x7F000002),
                                 };
 
-                        if (IN_SET(af, AF_INET6, AF_UNSPEC) && socket_ipv6_is_enabled())
+                        if (IN_SET(af, AF_INET6, AF_UNSPEC))
                                 buffer[n++] = (struct local_address) {
                                         .family = AF_INET6,
                                         .ifindex = dns_synthesize_ifindex(ifindex),

src/shared/dissect-image.c

@@ -2270,11 +2270,9 @@ int dissected_image_acquire_metadata(DissectedImage *m) {
 
         /* As per the os-release spec, if the image is an extension it will have a file
          * named after the image name in extension-release.d/ */
-        if (m->image_name) {
+        if (m->image_name)
-                char *ext = strjoina("/usr/lib/extension-release.d/extension-release.", m->image_name, "0");
+                paths[META_EXTENSION_RELEASE] = strjoina("/usr/lib/extension-release.d/extension-release.", m->image_name);
-                ext[strlen(ext) - 1] = '\0'; /* Extra \0 for NULSTR_FOREACH using placeholder from above */
+        else
-                paths[META_EXTENSION_RELEASE] = ext;
-        } else
                 log_debug("No image name available, will skip extension-release metadata");
 
         for (; n_meta_initialized < _META_MAX; n_meta_initialized ++) {

src/shared/format-table.c

@@ -1317,9 +1317,9 @@ static int table_data_compare(const size_t *a, const size_t *b, Table *t) {
 }
 
 static char* format_strv_width(char **strv, size_t column_width) {
-        _cleanup_free_ char *buf = NULL; /* buf must be freed after f */
         _cleanup_fclose_ FILE *f = NULL;
         size_t sz = 0;
+        _cleanup_free_ char *buf = NULL;
 
         f = open_memstream_unlocked(&buf, &sz);
         if (!f)
@@ -2320,8 +2320,8 @@ int table_print(Table *t, FILE *f) {
 }
 
 int table_format(Table *t, char **ret) {
-        _cleanup_free_ char *buf = NULL;
         _cleanup_fclose_ FILE *f = NULL;
+        char *buf = NULL;
         size_t sz = 0;
         int r;
 
@@ -2335,7 +2335,7 @@ int table_format(Table *t, char **ret) {
 
         f = safe_fclose(f);
 
-        *ret = TAKE_PTR(buf);
+        *ret = buf;
 
         return 0;
 }

src/shared/meson.build

@@ -244,6 +244,8 @@ shared_sources = files('''
         specifier.h
         switch-root.c
         switch-root.h
+        sysctl-util.c
+        sysctl-util.h
         tmpfile-util-label.c
         tmpfile-util-label.h
         tomoyo-util.c

src/shared/sysctl-util.c

@@ -96,14 +96,14 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c
         return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER);
 }
 
-int sysctl_read(const char *property, char **ret) {
+int sysctl_read(const char *property, char **content) {
         char *p;
 
         assert(property);
-        assert(ret);
+        assert(content);
 
         p = strjoina("/proc/sys/", property);
-        return read_full_virtual_file(p, ret, NULL);
+        return read_full_file(p, content, NULL);
 }
 
 int sysctl_read_ip_property(int af, const char *ifname, const char *property, char **ret) {
@@ -118,7 +118,7 @@ int sysctl_read_ip_property(int af, const char *ifname, const char *property, ch
                      ifname ? "/conf/" : "", strempty(ifname),
                      property[0] == '/' ? "" : "/", property);
 
-        r = read_full_virtual_file(p, &value, NULL);
+        r = read_one_line_file(p, &value);
         if (r < 0)
                 return r;
 

src/test/test-socket-util.c

@@ -504,11 +504,6 @@ static void test_flush_accept(void) {
         assert_se(flush_accept(listen_seqpacket) >= 0);
 }
 
-static void test_ipv6_enabled(void) {
-        log_info("IPv6 supported: %s", yes_no(socket_ipv6_is_supported()));
-        log_info("IPv6 enabled: %s", yes_no(socket_ipv6_is_enabled()));
-}
-
 int main(int argc, char *argv[]) {
         test_setup_logging(LOG_DEBUG);
 
@@ -524,7 +519,6 @@ int main(int argc, char *argv[]) {
         test_send_nodata_nofd();
         test_send_emptydata();
         test_flush_accept();
-        test_ipv6_enabled();
 
         return 0;
 }

src/udev/udev-event.c

@@ -1043,8 +1043,6 @@ int udev_event_execute_rules(UdevEvent *event,
         if (r < 0)
                 return log_device_debug_errno(dev, r, "Failed to update database under /run/udev/data/: %m");
 
-        device_set_is_initialized(dev);
-
         /* Yes, we run update_devnode() twice, because in the first invocation, that is before update of udev database,
          * it could happen that two contenders are replacing each other's symlink. Hence we run it again to make sure
          * symlinks point to devices that claim them with the highest priority. */
@@ -1052,6 +1050,8 @@ int udev_event_execute_rules(UdevEvent *event,
         if (r < 0)
                 return r;
 
+        device_set_is_initialized(dev);
+
         return 0;
 }
 

test/test-functions

@@ -725,12 +725,6 @@ printf "[Unit]\nConditionVirtualization=container\n\n[Service]\nTimeoutSec=240s\
 mkdir -p /etc/systemd/system/systemd-journal-flush.service.d
 printf "[Service]\nTimeoutSec=180s\n" >/etc/systemd/system/systemd-journal-flush.service.d/timeout.conf
 
-# D-Bus has troubles during system shutdown causing it to fail. Although it's
-# harmless, it causes unnecessary noise in the logs, so let's disable LSan's
-# at_exit check just for the dbus.service
-mkdir -p /etc/systemd/system/dbus.service.d
-printf "[Service]\nEnvironment=ASAN_OPTIONS=leak_check_at_exit=false\n" >/etc/systemd/system/dbus.service.d/disable-lsan.conf
-
 # The 'mount' utility doesn't behave well under libasan, causing unexpected
 # fails during boot and subsequent test results check:
 # bash-5.0# mount -o remount,rw -v /