From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 27 May 2024 11:30:11 +0000 (+0200)
Subject: nspawn: machine registration is now available unpriv
X-Git-Tag: v257-rc1~1062^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e16be05858d87e9783fae5584ad3378275f780f1;p=thirdparty%2Fsystemd.git

nspawn: machine registration is now available unpriv
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index ed428c6a0b0..6eec5a27a08 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1659,12 +1659,6 @@ static int verify_arguments(void) {
         SET_FLAG(arg_mount_settings, MOUNT_PRIVILEGED, arg_privileged);
 
         if (!arg_privileged) {
-                /* machined is not accessible to unpriv clients */
-                if (arg_register) {
-                        log_notice("Automatically implying --register=no, since machined is not accessible to unprivileged clients.");
-                        arg_register = false;
-                }
-
                 if (!arg_private_network) {
                         log_notice("Automatically implying --private-network, since mounting /sys/ in an unprivileged user namespaces requires network namespacing.");
                         arg_private_network = true;
@@ -5350,7 +5344,7 @@ static int run_container(
         }
 
         if (arg_register || !arg_keep_unit) {
-                if (arg_privileged)
+                if (arg_privileged || arg_register)
                         r = sd_bus_default_system(&bus);
                 else
                         r = sd_bus_default_user(&bus);