NEWS

@@ -540,53 +540,6 @@ CHANGES WITH 247 in spe:
           enabled in developer mode. It is thus recommended to set
           '-Dmode=release' in end-user and distro builds.
 
-        * systemd-cryptsetup gained support for processing detached LUKS
-          headers specified on the kernel command line via the header=
-          parameter of the luks.options= kernel command line option. The same
-          device/path syntax as for key files is supported for header files
-          like this.
-
-        * The "net_id" built-in of udev has been updated to ignore ACPI _SUN
-          slot index data for devices that are connected through a PCI bridge
-          where the _SUN index is associated with the bridge instead of the
-          network device itself. Previously this would create ambiguous device
-          naming if multiple network interfaces were connected to the same PCI
-          bridge. Since this is a naming scheme incompatibility on systems that
-          possess hardware like this it has been introduced as new naming
-          scheme "v247". The previous scheme can be selected via the
-          "net.naming-scheme=v245" kernel command line parameter.
-
-        * ConditionFirstBoot= semantics have been modified to be safe towards
-          abnormal system power-off during first boot. Specifically, the
-          "systemd-machine-id-commit.service" service now acts as boot
-          milestone indicating when the first boot process is sufficiently
-          complete in order to not consider the next following boot also a
-          first boot. If the system is reset before this unit is reached the
-          first time, the next boot will still be considered a first boot; once
-          it has been reached, no further boots will be considered a first
-          boot. The "first-boot-complete.target" unit now acts as official hook
-          point to order against this. If a service shall be run on every boot
-          until the first boot fully succeeds it may thus be ordered before
-          this target unit (and pull it in) and carry ConditionFirstBoot=
-          appropriately.
-
-        * bootctl's set-default and set-oneshot commands now accept the three
-          special strings "@default", "@oneshot", "@current" in place of a boot
-          entry id. These strings are resolved to the current default and
-          oneshot boot loader entry, as well as the currently booted one. Thus
-          a command "bootctl set-default @current" may be used to make the
-          currently boot menu item the new default for all subsequent boots.
-
-        * A new generic target unit "initrd-cryptsetup.target" has been added
-          that is supposed to pull in all encrypted volumes that shall be set
-          up during the initrd phase. It takes the place of "cryptsetup.target"
-          and "remote-cryptsetup.target" that exist during the host boot
-          phase. In other words, the new "initrd-cryptsetup.target" is supposed
-          to take the role for "initrd-fs.target", but for encrypted volumes.
-
-        * "systemctl edit" has been updated to show the original effective unit
-          contents in commented form in the text editor.
-
 CHANGES WITH 246:
 
         * The service manager gained basic support for cgroup v2 freezer. Units

man/systemd.net-naming-scheme.xml

@@ -270,8 +270,7 @@
   <refsect1>
     <title>History</title>
 
-    <para>The following "naming schemes" have been defined (which may be chosen at system boot-up time via
+    <para>The following "naming schemes" have been defined:</para>
-    the <varname>net.naming-scheme=</varname> kernel command line switch, see above:</para>
 
     <variablelist>
         <varlistentry>
@@ -360,7 +359,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term><constant>v247</constant></term>
+          <term><constant>v246</constant></term>
 
           <listitem><para>If the PCI slot is assocated with PCI bridge and that has multiple child network
           controllers then all of them might derive the same value of <varname>ID_NET_NAME_SLOT</varname>

src/shared/clock-util.c

@@ -151,9 +151,9 @@ int clock_apply_epoch(void) {
 
         if (stat(EPOCH_FILE, &st) < 0) {
                 if (errno != ENOENT)
-                        log_warning_errno(errno, "Cannot stat " EPOCH_FILE ": %m");
+                        log_warning_errno(errno, "Cannot stat %s: %m\n", EPOCH_FILE);
 
-                epoch_usec = (usec_t) TIME_EPOCH * USEC_PER_SEC;
+                epoch_usec = ((usec_t) TIME_EPOCH * USEC_PER_SEC);
         } else
                 epoch_usec = timespec_load(&st.st_mtim);
 

src/shared/netif-naming-scheme.c

@@ -12,7 +12,7 @@ static const NamingScheme naming_schemes[] = {
         { "v241", NAMING_V241 },
         { "v243", NAMING_V243 },
         { "v245", NAMING_V245 },
-        { "v247", NAMING_V247 },
+        { "v246", NAMING_V246 },
         /* … add more schemes here, as the logic to name devices is updated … */
 };
 

src/shared/netif-naming-scheme.h

@@ -40,7 +40,7 @@ typedef enum NamingSchemeFlags {
         NAMING_V241 = NAMING_V240 | NAMING_STABLE_VIRTUAL_MACS,
         NAMING_V243 = NAMING_V241 | NAMING_NETDEVSIM | NAMING_LABEL_NOPREFIX,
         NAMING_V245 = NAMING_V243 | NAMING_NSPAWN_LONG_HASH,
-        NAMING_V247 = NAMING_V245 | NAMING_BRIDGE_NO_SLOT,
+        NAMING_V246 = NAMING_V245 | NAMING_BRIDGE_NO_SLOT,
 
         _NAMING_SCHEME_FLAGS_INVALID = -1,
 } NamingSchemeFlags;