Merge branch 'hollywood' of suva.vyatta.com:/git/vyatta-cfg-system into hollywood

2 files changed, 15 insertions, 5 deletions

diff --git a/scripts/install-system b/scripts/install-system
index ad12de32..12ae10ed 100755
--- a/scripts/install-system
+++ b/scripts/install-system
@@ -577,14 +577,24 @@ install_grub () {
     echo -e "set default=$DEFAULT_CONSOLE"
     echo "set timeout=5"
     #echo "#set splashimage=(hd0,0)/grub/splash.xpm.gz"
-    echo "hiddenmenu"
     # set serial console options
     echo -e "serial --unit=0 --speed=9600"
-    echo "terminal --timeout=5 console serial"
+    echo "terminal serial"
     echo "set root=$root"
+
+    echo ""
+    echo "echo -n Press ESC to enter the Grub menu..."
+    echo "if sleep --verbose --interruptible 5 ; then"
+    echo -e "\tterminal console"
+    echo -e "\techo -n Press the ESC key to enter the Grub menu..."
+    echo -e "\tif sleep --verbose --interruptible 5 ; then"
+    echo -e "\t\tterminal serial"
+    echo -e "\t\tset timeout=0"
+    echo -e "\tfi"
+    echo "fi"
+    echo ""
+
     if [ -f "/boot/vmlinuz" ]; then
-       echo -e "set default=$DEFAULT_CONSOLE\n\n\n"
-  
        # Set first system boot option.  Make KVM the default console in this one.
        # mode values for vga=
        # Color depth      | 640x480 | 800x600 | 1024x768 | 1280x1024
diff --git a/scripts/system/vyatta_update_login.pl b/scripts/system/vyatta_update_login.pl
index 61fe68ca..bd103c57 100755
--- a/scripts/system/vyatta_update_login.pl
+++ b/scripts/system/vyatta_update_login.pl
@@ -76,7 +76,7 @@ for my $user (@user_keys) {
 	    # make new user using vyatta shell
 	    #  and make home directory (-m)
             #  and with default group of 100 (users)
-            $cmd = 'useradd -s /bin/vbash -m -n';
+            $cmd = 'useradd -s /bin/vbash -m -N';
         }
 	# TODO Add checks for attempts to put system users
  	# in configuration file