From 9faf77984175decb6ed08ba8ca2b65ea07c5867b Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Tue, 17 Dec 2019 14:43:03 -0500 Subject: Partially revert "fix unlocking method on FreeBSD" (#116) Specifically, revert the changes to logic which are incorrect. The testing introduced is for a separate part of the codebase, so is retained. This (partially) reverts commit e2840f1771158748780a768f6bfbb117cd7610c6. --- cloudinit/distros/freebsd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cloudinit/distros/freebsd.py') diff --git a/cloudinit/distros/freebsd.py b/cloudinit/distros/freebsd.py index caad1afb..8e5ae96c 100644 --- a/cloudinit/distros/freebsd.py +++ b/cloudinit/distros/freebsd.py @@ -256,7 +256,7 @@ class Distro(distros.Distro): def lock_passwd(self, name): try: - util.subp(['pw', 'lock', name]) + util.subp(['pw', 'usermod', name, '-h', '-']) except Exception as e: util.logexc(LOG, "Failed to lock user %s", name) raise e -- cgit v1.2.3