Add systemd-analyze verb to list runtime unit properties (#37665)

test/units/TEST-07-PID1.delegate-namespaces.sh

@@ -45,8 +45,8 @@ testcase_pid() {
 }
 
 testcase_uts() {
-    (! systemd-run -p PrivateUsersEx=self -p ProtectHostnameEx=private --wait --pipe -- hostname abc)
-    systemd-run -p PrivateUsersEx=self -p ProtectHostnameEx=private -p DelegateNamespaces=uts --wait --pipe -- hostname abc
+    (! systemd-run -p PrivateUsersEx=self -p ProtectHostname=private --wait --pipe -- hostname abc)
+    systemd-run -p PrivateUsersEx=self -p ProtectHostname=private -p DelegateNamespaces=uts --wait --pipe -- hostname abc
 }
 
 testcase_implied_private_users_self() {

test/units/TEST-07-PID1.protect-hostname.sh

@@ -22,7 +22,7 @@ testcase_yes() {
     (! systemd-run --wait -p ProtectHostname=yes hostname foo)
 
     # ProtectHostname=yes can optionally take a hostname.
-    systemd-run --wait -p ProtectHostnameEx=yes:hoge \
+    systemd-run --wait -p ProtectHostname=yes:hoge \
         -P bash -xec '
             test "$(hostname)" = "hoge"
             (! hostname foo)
@@ -50,10 +50,18 @@ EOF
 
     systemd-run --wait -p ProtectHostname=yes -p PrivateMounts=yes \
         findmnt --mountpoint /proc/sys/kernel/hostname
+
+    # Check that ProtectHostnameEx=… also works.
+    systemd-run --wait -p ProtectHostnameEx=yes:hoge \
+        -P bash -xec '
+            test "$(hostname)" = "hoge"
+            (! hostname foo)
+            test "$(hostname)" = "hoge"
+        '
 }
 
 testcase_private() {
-    systemd-run --wait -p ProtectHostnameEx=private \
+    systemd-run --wait -p ProtectHostname=private \
         -P bash -xec '
             hostname foo
             test "$(hostname)" = "foo"
@@ -64,7 +72,7 @@ testcase_private() {
     test "$(hostnamectl hostname)" = "$HOSTNAME_FROM_SYSTEMD"
 
     # ProtectHostname=private can optionally take a hostname.
-    systemd-run --wait -p ProtectHostnameEx=private:hoge \
+    systemd-run --wait -p ProtectHostname=private:hoge \
         -P bash -xec '
             test "$(hostname)" = "hoge"
             hostname foo
@@ -91,7 +99,7 @@ EOF
     test "$(hostnamectl hostname)" = "$HOSTNAME_FROM_SYSTEMD"
 
     # Verify /proc/sys/kernel/hostname is not bind mounted from host read-only.
-    (! systemd-run --wait -p ProtectHostnameEx=private -p PrivateMounts=yes \
+    (! systemd-run --wait -p ProtectHostname=private -p PrivateMounts=yes \
         findmnt --mountpoint /proc/sys/kernel/hostname)
 }
 

test/units/TEST-07-PID1.transient-unit-container.sh

@@ -157,7 +157,7 @@ testcase_transient_unit_container_file_write() {
     -p RootDirectory="$CONTAINER_ROOT_FS" \
     -p PrivatePIDs=yes \
     -p PrivateUsersEx=full \
-    -p ProtectHostnameEx=private \
+    -p ProtectHostname=private \
     -p ProtectControlGroupsEx=private \
     -p PrivateMounts=yes \
     -p PrivateNetwork=yes \

test/units/TEST-54-CREDS.sh

@@ -334,7 +334,7 @@ systemd-run -p "ImportCredential=test.creds.*" \
             test ! -e '${CREDENTIALS_DIRECTORY}/test.creds.hoge:invalid'
 
 # Check if credentials with invalid names are not imported (with renaming).
-systemd-run -p "ImportCredentialEx=test.creds.*:renamed.creds." \
+systemd-run -p "ImportCredential=test.creds.*:renamed.creds." \
             --unit=test-54-ImportCredential.service \
             -p DynamicUser=1 \
             --wait \
@@ -352,8 +352,8 @@ systemd-run -p "ImportCredential=test.creds.*" \
                 '${CREDENTIALS_DIRECTORY}/test.creds.third' >/tmp/ts54-concat
 cmp /tmp/ts54-concat <(echo -n abc)
 
-# Check that ImportCredentialEx= works without renaming.
-systemd-run -p "ImportCredentialEx=test.creds.*" \
+# Check that ImportCredential= works without renaming.
+systemd-run -p "ImportCredential=test.creds.*" \
             --unit=test-54-ImportCredential.service \
             -p DynamicUser=1 \
             --wait \
@@ -364,7 +364,7 @@ systemd-run -p "ImportCredentialEx=test.creds.*" \
 cmp /tmp/ts54-concat <(echo -n abc)
 
 # Check that renaming with globs works as expected.
-systemd-run -p "ImportCredentialEx=test.creds.*:renamed.creds." \
+systemd-run -p "ImportCredential=test.creds.*:renamed.creds." \
             --unit=test-54-ImportCredential.service \
             -p DynamicUser=1 \
             --wait \
@@ -375,7 +375,7 @@ systemd-run -p "ImportCredentialEx=test.creds.*:renamed.creds." \
 cmp /tmp/ts54-concat <(echo -n abc)
 
 # Check that renaming without globs works as expected.
-systemd-run -p "ImportCredentialEx=test.creds.first:renamed.creds.first" \
+systemd-run -p "ImportCredential=test.creds.first:renamed.creds.first" \
             --unit=test-54-ImportCredential.service \
             -p DynamicUser=1 \
             --wait \
@@ -384,8 +384,8 @@ systemd-run -p "ImportCredentialEx=test.creds.first:renamed.creds.first" \
 cmp /tmp/ts54-concat <(echo -n a)
 
 # Test that multiple renames are processed in the correct order.
-systemd-run -p "ImportCredentialEx=test.creds.first:renamed.creds.first" \
-            -p "ImportCredentialEx=test.creds.second:renamed.creds.first" \
+systemd-run -p "ImportCredential=test.creds.first:renamed.creds.first" \
+            -p "ImportCredential=test.creds.second:renamed.creds.first" \
             --unit=test-54-ImportCredential.service \
             -p DynamicUser=1 \
             --wait \
@@ -394,6 +394,7 @@ systemd-run -p "ImportCredentialEx=test.creds.first:renamed.creds.first" \
 cmp /tmp/ts54-concat <(echo -n a)
 
 # Test that a credential can be imported multiple times with different names.
+# We use the deprecated name ImportCredentialEx= on purpose to check that it works.
 systemd-run -p "ImportCredentialEx=test.creds.first" \
             -p "ImportCredentialEx=test.creds.first:renamed.creds.first" \
             -p "ImportCredentialEx=test.creds.first:renamed.creds.second" \

test/units/TEST-65-ANALYZE.sh

@@ -1105,6 +1105,17 @@ else
     echo "have no tpm2"
 fi
 
+# Test "transient-settings" verb
+
+# shellcheck disable=SC2046
+systemd-analyze --no-pager transient-settings $(systemctl --no-legend --no-pager -t help)
+systemd-analyze transient-settings service | grep NoNewPrivileges
+systemd-analyze transient-settings mount | grep CPUQuotaPeriodSec
+# make sure deprecated names are not printed
+(! systemd-analyze transient-settings service | grep CPUAccounting )
+(! systemd-analyze transient-settings service | grep ConditionKernelVersion )
+(! systemd-analyze transient-settings service | grep AssertKernelVersion )
+
 systemd-analyze log-level info
 
 touch /testok