docs/DISCOVERABLE_PARTITIONS.md

@@ -64,7 +64,7 @@ Other GPT type IDs might be used on Linux, for example to mark software RAID or
 LVM partitions. The definitions of those GPT types is outside of the scope of
 this specification.
 
-[systemd-id128(1)](http://www.freedesktop.org/software/systemd/man/systemd-id128.html)
+[systemd-id128(1)](http://www.freedesktop.org/software/systemd/man/systemd-i128.html)
 may be used to list those UUIDs.
 
 ## Partition Names

src/core/selinux-setup.c

@@ -50,10 +50,7 @@ int mac_selinux_setup(bool *loaded_policy) {
 
         /* Already initialized by somebody else? */
         r = getcon_raw(&con);
-        /* getcon_raw can return 0, and still give us a NULL pointer if
-         * /proc/self/attr/current is empty. SELinux guarantees this won't
-         * happen, but that file isn't specific to SELinux, and may be provided
-         * by some other arbitrary LSM with different semantics. */
+        /* getcon_raw can return 0, and still give us a NULL pointer. */
         if (r == 0 && con) {
                 initialized = !streq(con, "kernel");
                 freecon(con);

src/shared/pretty-print.c

@@ -234,12 +234,6 @@ static int guess_type(const char **name, char ***prefixes, bool *is_collection,
         if (!n)
                 return log_oom();
 
-        /* All systemd-style config files should support the /usr-/etc-/run split and
-         * dropins. Let's add a blanket rule that allows us to support them without keeping
-         * an explicit list. */
-        if (path_startswith(n, "systemd") && endswith(n, ".conf"))
-                usr = true;
-
         delete_trailing_chars(n, "/");
 
         if (endswith(n, ".d"))