Merge branch 'kenwood' of 192.168.100.1:git/vyatta-cfg-system into kenwood

2 files changed, 15 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;
         }
 
diff --git a/sysconf/vyatta-net.rules b/sysconf/vyatta-net.rules
index a215c325..a94f5b2a 100644
--- a/sysconf/vyatta-net.rules
+++ b/sysconf/vyatta-net.rules
@@ -9,5 +9,12 @@ KERNEL=="eth*", DRIVERS=="?*",\
 	PROGRAM="vyatta_net_name %k $attr{address}", \
 	NAME="%c"
 
+# This keeps udev persistent net rules from trying to do anything
+# with multiple SSID's per device
+# TODO: Add proper persistent network based on Vyatta config
+#     but right now there is insufficient info in sysfs to uniquely
+#     determine device name based on hardware information
+KERNEL=="wlan*", DRIVERS=="?*", NAME="%k"
+
 LABEL="vyatta_net_end"