src/core/user.conf.in

@@ -7,7 +7,7 @@
 #
 # Entries in this file show the compile time defaults. Local configuration
 # should be created by either modifying this file, or by creating "drop-ins" in
-# the user.conf.d/ subdirectory. The latter is generally recommended.
+# the system.conf.d/ subdirectory. The latter is generally recommended.
 # Defaults can be restored by simply deleting this file and all drop-ins.
 #
 # See systemd-user.conf(5) for details.

src/coredump/coredump.conf

@@ -7,7 +7,7 @@
 #
 # Entries in this file show the compile time defaults. Local configuration
 # should be created by either modifying this file, or by creating "drop-ins" in
-# the coredump.conf.d/ subdirectory. The latter is generally recommended.
+# the system.conf.d/ subdirectory. The latter is generally recommended.
 # Defaults can be restored by simply deleting this file and all drop-ins.
 #
 # Use 'systemd-analyze cat-config systemd/coredump.conf' to display the full config.

src/home/homed.conf

@@ -7,7 +7,7 @@
 #
 # Entries in this file show the compile time defaults. Local configuration
 # should be created by either modifying this file, or by creating "drop-ins" in
-# the homed.conf.d/ subdirectory. The latter is generally recommended.
+# the system.conf.d/ subdirectory. The latter is generally recommended.
 # Defaults can be restored by simply deleting this file and all drop-ins.
 #
 # Use 'systemd-analyze cat-config systemd/homed.conf' to display the full config.

src/journal-remote/journal-remote.conf.in

@@ -7,7 +7,7 @@
 #
 # Entries in this file show the compile time defaults. Local configuration
 # should be created by either modifying this file, or by creating "drop-ins" in
-# the journal-remote.conf.d/ subdirectory. The latter is generally recommended.
+# the system.conf.d/ subdirectory. The latter is generally recommended.
 # Defaults can be restored by simply deleting this file and all drop-ins.
 #
 # See journal-remote.conf(5) for details.

src/journal-remote/journal-upload.conf.in

@@ -7,7 +7,7 @@
 #
 # Entries in this file show the compile time defaults. Local configuration
 # should be created by either modifying this file, or by creating "drop-ins" in
-# the journal-upload.conf.d/ subdirectory. The latter is generally recommended.
+# the system.conf.d/ subdirectory. The latter is generally recommended.
 # Defaults can be restored by simply deleting this file and all drop-ins.
 #
 # See journal-upload.conf(5) for details.

src/journal/journald.conf

@@ -7,7 +7,7 @@
 #
 # Entries in this file show the compile time defaults. Local configuration
 # should be created by either modifying this file, or by creating "drop-ins" in
-# the journald.conf.d/ subdirectory. The latter is generally recommended.
+# the system.conf.d/ subdirectory. The latter is generally recommended.
 # Defaults can be restored by simply deleting this file and all drop-ins.
 #
 # Use 'systemd-analyze cat-config systemd/journald.conf' to display the full config.

src/login/logind.conf.in

@@ -7,7 +7,7 @@
 #
 # Entries in this file show the compile time defaults. Local configuration
 # should be created by either modifying this file, or by creating "drop-ins" in
-# the logind.conf.d/ subdirectory. The latter is generally recommended.
+# the system.conf.d/ subdirectory. The latter is generally recommended.
 # Defaults can be restored by simply deleting this file and all drop-ins.
 #
 # Use 'systemd-analyze cat-config systemd/logind.conf' to display the full config.

src/network/networkd.conf

@@ -7,7 +7,7 @@
 #
 # Entries in this file show the compile time defaults. Local configuration
 # should be created by either modifying this file, or by creating "drop-ins" in
-# the networkd.conf.d/ subdirectory. The latter is generally recommended.
+# the system.conf.d/ subdirectory. The latter is generally recommended.
 # Defaults can be restored by simply deleting this file and all drop-ins.
 #
 # See networkd.conf(5) for details.

src/oom/oomd.conf

@@ -7,7 +7,7 @@
 #
 # Entries in this file show the compile time defaults. Local configuration
 # should be created by either modifying this file, or by creating "drop-ins" in
-# the oomd.conf.d/ subdirectory. The latter is generally recommended.
+# the system.conf.d/ subdirectory. The latter is generally recommended.
 # Defaults can be restored by simply deleting this file and all drop-ins.
 #
 # Use 'systemd-analyze cat-config systemd/oomd.conf' to display the full config.

src/pstore/pstore.conf

@@ -7,7 +7,7 @@
 #
 # Entries in this file show the compile time defaults. Local configuration
 # should be created by either modifying this file, or by creating "drop-ins" in
-# the pstore.conf.d/ subdirectory. The latter is generally recommended.
+# the system.conf.d/ subdirectory. The latter is generally recommended.
 # Defaults can be restored by simply deleting this file and all drop-ins.
 #
 # See pstore.conf(5) for details.

src/resolve/resolved.conf.in

@@ -7,7 +7,7 @@
 #
 # Entries in this file show the compile time defaults. Local configuration
 # should be created by either modifying this file, or by creating "drop-ins" in
-# the resolved.conf.d/ subdirectory. The latter is generally recommended.
+# the system.conf.d/ subdirectory. The latter is generally recommended.
 # Defaults can be restored by simply deleting this file and all drop-ins.
 #
 # Use 'systemd-analyze cat-config systemd/resolved.conf' to display the full config.

src/shared/gpt.c

@@ -158,8 +158,7 @@ bool gpt_partition_type_knows_read_only(sd_id128_t id) {
                                 GPT_HOME,
                                 GPT_SRV,
                                 GPT_VAR,
-                                GPT_TMP,
+                                GPT_TMP) ||
-                                GPT_XBOOTLDR) ||
                 gpt_partition_type_is_root_verity(id) || /* pretty much implied, but let's set the bit to make things really clear */
                 gpt_partition_type_is_usr_verity(id);    /* ditto */
 }

src/sleep/sleep.conf

@@ -7,7 +7,7 @@
 #
 # Entries in this file show the compile time defaults. Local configuration
 # should be created by either modifying this file, or by creating "drop-ins" in
-# the sleep.conf.d/ subdirectory. The latter is generally recommended.
+# the system.conf.d/ subdirectory. The latter is generally recommended.
 # Defaults can be restored by simply deleting this file and all drop-ins.
 #
 # See systemd-sleep.conf(5) for details.

src/timesync/timesyncd.conf.in

@@ -7,7 +7,7 @@
 #
 # Entries in this file show the compile time defaults. Local configuration
 # should be created by either modifying this file, or by creating "drop-ins" in
-# the timesyncd.conf.d/ subdirectory. The latter is generally recommended.
+# the system.conf.d/ subdirectory. The latter is generally recommended.
 # Defaults can be restored by simply deleting this file and all drop-ins.
 #
 # See timesyncd.conf(5) for details.