Allow root account to not exist

If root account is deleted, disable it rather than removing it from
passwd file and confusing everything.

1 files changed, 8 insertions, 4 deletions

diff --git a/lib/Vyatta/Login/User.pm b/lib/Vyatta/Login/User.pm
index 3b1170ff..b03b90b7 100755
--- a/lib/Vyatta/Login/User.pm
+++ b/lib/Vyatta/Login/User.pm
@@ -159,14 +159,18 @@ sub update {
     my %users     = $uconfig->listNodeStatus();
 
     die "All users deleted!\n" unless %users;
-    die "User root cannot be deleted\n"
-	if (! defined $users{'root'} || $users{'root'} eq 'deleted');
 
     foreach my $user ( keys %users ) {
 	my $state = $users{$user};
         if ( $state eq 'deleted' ) {
-            system("sudo userdel -r '$user'") == 0
-              or die "userdel failed: $?\n";
+	    if ($user eq 'root') {
+		warn "Disabling root account, instead of deleting\n";
+		system ('sudo usermod -p ! root') == 0
+		    or die "usermod of root failed: $?\n";
+	    } else {
+		system("sudo userdel -r '$user'") == 0
+		    or die "userdel of $user failed: $?\n";
+	    }
 	    next;
         }