From e22eb2d21c15a0053178b88c8b9444d0d05e9af1 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Tue, 8 Dec 2009 14:48:22 -0800
Subject: Keep udev from borking wireless device names

If second wlan device is created (for multiple ssid), then udev
rules don't know how to handle it. For now, just accept what kernel
gives us.
---
 sysconf/vyatta-net.rules | 7 +++++++
 1 file changed, 7 insertions(+)

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"
 
-- 
cgit v1.2.3


From f956bfc6ee753fbbf251a7c43e7ad2573aa89c83 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Tue, 8 Dec 2009 14:49:39 -0800
Subject: Allow root account to not exist

If root account is deleted, disable it rather than removing it from
passwd file and confusing everything.
---
 lib/Vyatta/Login/User.pm | 12 ++++++++----
 1 file 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;
         }
 
-- 
cgit v1.2.3