Add experimental manpage marker, use it for sd-sysupdate and move it back to libexecdir (#43533)

2026-08-27 10:46:01 +01:00
parent 445c6ce8a2 104ce53916
commit 2de150d7b7
14 changed files with 51 additions and 20 deletions
@@ -104,6 +104,12 @@ CHANGES WITH 262:
          so the filters were silently ignored. Scripts relying on filtered
          field lists should be adjusted to query entries explicitly.

+        * The systemd-sysupdate binary has been moved back from bindir to
+          libexecdir, as more breaking changes are forthcoming and it is thus
+          again marked as experimental. It will be stabilized in a future
+          release. The libexecdir path is the backwards compatible way to call
+          it.
+
        Changes in the system and service manager:

        * The manager now embeds a basic set of unit files (basic.target,
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE refsect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+<!--
+  SPDX-License-Identifier: LGPL-2.1-or-later
+-->
+
+<refsect1>
+  <title/>
+
+  <!-- for individual section(s) of a manpage -->
+  <para id="singular">This option is experimental and subject to change at any given moment without notice.
+  It will be stabilized and given a backward-compatibility guarantee in a future release.</para>
+
+  <para id="plural">These options are experimental and subject to change at any given moment without notice.
+  They will be stabilized and given a backward-compatibility guarantee in a future release.</para>
+
+  <!-- for a whole manpage -->
+  <refsect1 id="component"><title>Experimental</title>
+    <para>This component is experimental and subject to change at any given moment without notice.
+    It will be stabilized and given a backward-compatibility guarantee in a future release.</para>
+  </refsect1>
+</refsect1>
@@ -20,6 +20,8 @@
    <refpurpose>The D-Bus interface of systemd-sysupdated</refpurpose>
  </refnamediv>

+  <xi:include href="experimental.xml" xpointer="component"/>
+
  <refsect1>
    <title>Introduction</title>

@@ -40,6 +40,8 @@
    <para><filename>systemd-sysupdate-update.service</filename></para>
  </refsynopsisdiv>

+  <xi:include href="experimental.xml" xpointer="component" />
+
  <refsect1>
    <title>Description</title>

@@ -3,7 +3,8 @@
  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->

-<refentry id="systemd-sysupdated.service" conditional='ENABLE_SYSUPDATED'>
+<refentry id="systemd-sysupdated.service" conditional='ENABLE_SYSUPDATED'
+    xmlns:xi="http://www.w3.org/2001/XInclude">

  <refentryinfo>
    <title>systemd-sysupdated.service</title>
@@ -26,6 +27,8 @@
    <para><filename>/usr/lib/systemd/systemd-sysupdated</filename></para>
  </refsynopsisdiv>

+  <xi:include href="experimental.xml" xpointer="component" />
+
  <refsect1>
    <title>Description</title>

@@ -20,11 +20,13 @@ TS="${SOURCE_DATE_EPOCH:-$(date +%s)}"
 # extension.
 # TODO: remove autovt@ removal when the upstream spec is updated
 # TODO: remove systemd-udevd-control.socket removal when the upstream spec is updated
+# TODO: remove systemd-sysupdate removal when the upstream spec is updated
 while read -r filelist; do
    sed -E \
        -e '/autovt@/d' \
        -e '/sockets\.target\.wants\/systemd-udevd-control\.socket/d' \
        -e '/systemd-udevd-control\.socket\.8/d' \
+        -e '/^%\{_bindir\}\/systemd-sysupdate$/d' \
        -e 's/\.gz$//' \
        "$filelist" >"/tmp/$(basename "$filelist")"
    mount --bind "/tmp/$(basename "$filelist")" "$filelist"
@@ -9,5 +9,5 @@ Environment=
        GIT_URL=https://salsa.debian.org/systemd-team/systemd.git
        GIT_SUBDIR=debian
        GIT_BRANCH=debian/master
-        GIT_COMMIT=9badaae1c4c08db447b4e409784688f32d3f04f3
+        GIT_COMMIT=b12500baf3363288c692d47814c53b55f13e424e
        PKG_SUBDIR=debian
@@ -24,7 +24,7 @@ systemd_updatectl_sources = files(
 )

 executables += [
-        executable_template + {
+        libexec_template + {
                'name' : 'systemd-sysupdate',
                'public' : true,
                'conditions' : ['ENABLE_SYSUPDATE'],
@@ -63,10 +63,3 @@ if conf.get('ENABLE_SYSUPDATED') == 1
        install_data('org.freedesktop.sysupdate1.policy',
                     install_dir : polkitpolicydir)
 endif
-
-if conf.get('ENABLE_SYSUPDATE') == 1
-        # symlink for backwards compatibility after rename
-        install_symlink('systemd-sysupdate',
-                        pointing_to : libexecdir_to_bin / 'systemd-sysupdate',
-                        install_dir : libexecdir)
-endif
@@ -5,7 +5,7 @@
 set -eux
 set -o pipefail

-SYSUPDATE=/usr/bin/systemd-sysupdate
+SYSUPDATE=/usr/lib/systemd/systemd-sysupdate
 SYSUPDATED=/lib/systemd/systemd-sysupdated
 UPDATECTL=""
 VARLINK_SOCKET=/run/systemd/io.systemd.SysUpdate
@@ -890,11 +890,11 @@ units = [
          'conditions' : ['ENABLE_SYSINSTALL'],
        },
        {
-          'file' : 'systemd-sysupdate-auto-enable.service',
+          'file' : 'systemd-sysupdate-auto-enable.service.in',
          'conditions' : ['ENABLE_SYSUPDATE'],
        },
        {
-          'file' : 'systemd-sysupdate-reboot.service',
+          'file' : 'systemd-sysupdate-reboot.service.in',
          'conditions' : ['ENABLE_SYSUPDATE'],
        },
        {
@@ -902,12 +902,12 @@ units = [
          'conditions' : ['ENABLE_SYSUPDATE'],
        },
        {
-          'file' : 'systemd-sysupdate-update.service',
+          'file' : 'systemd-sysupdate-update.service.in',
          'conditions' : ['ENABLE_SYSUPDATE'],
          'symlinks' : ['systemd-sysupdate.service'],  # compatibility after rename
        },
        {
-          'file' : 'systemd-sysupdate@.service',
+          'file' : 'systemd-sysupdate@.service.in',
          'conditions' : ['ENABLE_SYSUPDATE'],
        },
        {
@@ -14,8 +14,8 @@ Before=systemd-sysupdate-update.service

 [Service]
 Type=oneshot
-ExecStart=systemd-sysupdate enable-component --component-suggested
-ExecStart=systemd-sysupdate enable-feature --component-all --feature-suggested
+ExecStart={{LIBEXECDIR}}/systemd-sysupdate enable-component --component-suggested
+ExecStart={{LIBEXECDIR}}/systemd-sysupdate enable-feature --component-all --feature-suggested

 [Install]
 WantedBy=systemd-sysupdate-update.service
@@ -14,7 +14,7 @@ ConditionVirtualization=!container

 [Service]
 Type=oneshot
-ExecStart=systemd-sysupdate reboot
+ExecStart={{LIBEXECDIR}}/systemd-sysupdate reboot

 [Install]
 Also=systemd-sysupdate-reboot.timer
@@ -17,7 +17,7 @@ ConditionVirtualization=!container
 [Service]
 Type=simple
 NotifyAccess=main
-ExecStart=systemd-sysupdate update --component-all --cleanup=yes
+ExecStart={{LIBEXECDIR}}/systemd-sysupdate update --component-all --cleanup=yes

 # Keep this sandboxing synchronised with systemd-sysupdate@.service
 CapabilityBoundingSet=CAP_CHOWN CAP_FOWNER CAP_FSETID CAP_MKNOD CAP_SETFCAP CAP_SYS_ADMIN CAP_SETPCAP CAP_DAC_OVERRIDE CAP_LINUX_IMMUTABLE
@@ -15,7 +15,7 @@ Conflicts=shutdown.target
 Before=shutdown.target

 [Service]
-ExecStart=-systemd-sysupdate
+ExecStart=-{{LIBEXECDIR}}/systemd-sysupdate

 # Keep this sandboxing synchronised with systemd-sysupdate-update.service
 CapabilityBoundingSet=CAP_CHOWN CAP_FOWNER CAP_FSETID CAP_MKNOD CAP_SETFCAP CAP_SYS_ADMIN CAP_SETPCAP CAP_DAC_OVERRIDE CAP_LINUX_IMMUTABLE