Fix wizard disabling on headless images

Signed-off-by: paulober <paul.oberosler@raspberrypi.com>

Author: paulober

cloudinit/distros/__init__.py

@@ -1,11 +1,13 @@
 # Copyright (C) 2012 Canonical Ltd.
 # Copyright (C) 2012, 2013 Hewlett-Packard Development Company, L.P.
 # Copyright (C) 2012 Yahoo! Inc.
+# Copyright (C) 2025 Raspberry Pi Ltd.
 #
 # Author: Scott Moser <scott.moser@canonical.com>
 # Author: Juerg Haefliger <juerg.haefliger@hp.com>
 # Author: Joshua Harlow <harlowja@yahoo-inc.com>
 # Author: Ben Howard <ben.howard@canonical.com>
+# Author: Paul Oberosler <paul.oberosler@raspberrypi.com>
 #
 # This file is part of cloud-init. See LICENSE file for license information.
 
@@ -1367,6 +1369,8 @@ def manage_service(
                 "reload": ["reload-or-restart", service],
                 "try-reload": ["try-reload-or-restart", service],
                 "status": ["status", service],
+                "mask": ["mask", service],
+                "unmask": ["unmask", service],
             }
         else:
             cmds = {
@@ -1378,6 +1382,8 @@ def manage_service(
                 "reload": [service, "restart"],
                 "try-reload": [service, "restart"],
                 "status": [service, "status"],
+                "mask": [service, "stop"],
+                "unmask": [service, "stop"],
             }
         cmd = init_cmd + cmds[action] + list(extra_args)
         return subp.subp(cmd, capture=True, rcs=rcs)

cloudinit/distros/raspberry_pi_os.py

@@ -83,6 +83,9 @@ def add_user(self, name, **kwargs) -> bool:
             if plain:
                 self.set_passwd(name, plain, hashed=False)
 
+        # Mask userconfig.service
+        self.manage_service("mask", "userconfig.service", "--now")
+
         # honor all other options that would otherwise
         # add_user have taken care of
 

tests/unittests/distros/test_raspberry_pi_os.py

@@ -63,7 +63,10 @@ def test_add_user_happy_path(self, m_subp):
         cls = fetch("raspberry_pi_os")
         distro = cls("raspberry-pi-os", {}, None)
 
-        assert distro.add_user("pi") is True
+        with mock.patch(
+            "cloudinit.distros.Distro.manage_service", return_value=True
+        ) as m_service:
+            assert distro.add_user("pi") is True
         m_subp.assert_called_once()
 
         # Accept both common locations for userconf