.github/workflows/coverage.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - uses: systemd/mkosi@d45142e329550abc9c6fc63c1f1f86e5286d3d67
+      - uses: systemd/mkosi@5598b7f5793b6f63db5afaa39504a763fbaeb5cb
 
       # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
       # immediately, we remove the files in the background. However, we first move them to a different location

.github/workflows/linter.yml

@@ -38,7 +38,7 @@ jobs:
           LINTER_RULES_PATH: .github/linters
           GITHUB_ACTIONS_CONFIG_FILE: actionlint.yml
 
-      - uses: systemd/mkosi@d45142e329550abc9c6fc63c1f1f86e5286d3d67
+      - uses: systemd/mkosi@5598b7f5793b6f63db5afaa39504a763fbaeb5cb
 
       - name: Check that tabs are not used in Python code
         run: sh -c '! git grep -P "\\t" -- src/core/generate-bpf-delegate-configs.py src/boot/generate-hwids-section.py src/ukify/ukify.py test/integration-tests/integration-test-wrapper.py'

.github/workflows/mkosi.yml

@@ -167,7 +167,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - uses: systemd/mkosi@d45142e329550abc9c6fc63c1f1f86e5286d3d67
+      - uses: systemd/mkosi@5598b7f5793b6f63db5afaa39504a763fbaeb5cb
 
       # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
       # immediately, we remove the files in the background. However, we first move them to a different location

man/systemd-ssh-generator.xml

@@ -129,22 +129,6 @@
 
         <xi:include href="version-info.xml" xpointer="v256"/></listitem>
       </varlistentry>
-
-      <varlistentry>
-        <term><varname>ssh.ephemeral-authorized_keys-all</varname></term>
-
-        <listitem>
-          <para>Provides additional public keys, given in the customary <filename>authorized_keys</filename>
-            format, for all users, for incoming connections via the generated <constant>AF_VSOCK</constant>
-            and <constant>AF_UNIX</constant> socket units.</para>
-
-          <para>The intended use of this is for a host system (in either VM or container configurations) to
-            generate a keypair and inject the public key into the guest, using the private key to connect to
-            any user account on the guest via ssh, without further authentication.</para>
-
-          <xi:include href="version-info.xml" xpointer="v256"/>
-        </listitem>
-      </varlistentry>
     </variablelist>
   </refsect1>
 

man/systemd.system-credentials.xml

@@ -205,25 +205,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><varname>ssh.ephemeral-authorized_keys-all</varname></term>
-
-        <listitem>
-          <para>Provides additional public keys, given in the customary <filename>authorized_keys</filename>
-            format, for all users, for incoming connections via the generated <constant>AF_VSOCK</constant>
-            and <constant>AF_UNIX</constant> socket units.</para>
-
-          <para>The intended use of this is for a host system (in either VM or container configurations) to
-            generate a keypair and inject the public key into the guest, using the private key to connect to
-            any user account on the guest via ssh, without further authentication.</para>
-
-          <para>Consumed by
-            <citerefentry><refentrytitle>systemd-ssh-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
-
-          <xi:include href="version-info.xml" xpointer="v256"/>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><varname>ssh.authorized_keys.root</varname></term>
         <listitem>

mkosi/mkosi.conf

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Config]
-MinimumVersion=commit:d45142e329550abc9c6fc63c1f1f86e5286d3d67
+MinimumVersion=commit:5598b7f5793b6f63db5afaa39504a763fbaeb5cb
 Dependencies=
         exitrd
         initrd

mkosi/mkosi.sync

@@ -23,9 +23,14 @@ if [[ -d "pkg/$PKG_SUBDIR/.git" ]]; then
     fi
 
     # If work is being done on the packaging rules in a separate branch, don't touch the checkout.
-    if [[ -z "$(git -C "pkg/$PKG_SUBDIR" branch --remotes --list "origin/*" --contains HEAD)" ]]; then
-        echo "Currently checked out pkg/$PKG_SUBDIR commit is not part of any origin branch, not checking out commit $GIT_COMMIT" >&2
+    if ! git -C "pkg/$PKG_SUBDIR" merge-base --is-ancestor HEAD "origin/$GIT_BRANCH"; then
+        EXIT_STATUS=$?
+        if [[ $EXIT_STATUS -eq 1 ]]; then
+            echo "Currently checked out pkg/$PKG_SUBDIR commit is not an ancestor of origin/$GIT_BRANCH, not checking out commit $GIT_COMMIT" >&2
             exit 0
+        else
+            exit $EXIT_STATUS
+        fi
     fi
 fi
 

po/LINGUAS

@@ -43,4 +43,3 @@ zh_TW
 kn
 ar
 km
-kw

po/ru.po

@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-07-23 15:38+0100\n"
-"PO-Revision-Date: 2025-09-03 09:14+0000\n"
+"PO-Revision-Date: 2025-08-31 14:53+0000\n"
 "Last-Translator: \"Sergey A.\" <Ser82-png@yandex.ru>\n"
 "Language-Team: Russian <https://translate.fedoraproject.org/projects/systemd/"
 "main/ru/>\n"
@@ -1224,12 +1224,14 @@ msgstr ""
 
 #: src/resolve/org.freedesktop.resolve1.policy:154
 msgid "Subscribe to DNS configuration"
-msgstr "Подписка на конфигурацию DNS"
+msgstr ""
 
 #: src/resolve/org.freedesktop.resolve1.policy:155
+#, fuzzy
+#| msgid "Authentication is required to subscribe query results."
 msgid "Authentication is required to subscribe to DNS configuration."
 msgstr ""
-"Чтобы подписаться на конфигурацию DNS, необходимо пройти аутентификацию."
+"Чтобы подписаться на результаты запроса, необходимо пройти аутентификацию."
 
 #: src/resolve/org.freedesktop.resolve1.policy:165
 msgid "Dump cache"