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

2 files changed, 93 insertions, 45 deletions

diff --git a/debian/changelog b/debian/changelog
index 090fc836..8acdc606 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+vyatta-cfg-system (0.17.70) unstable; urgency=low
+
+  [ Stephen Hemminger ]
+  * Fix language in help text for loadkey
+  * Use val_help: for Ethernet interface parameters
+  * bonding vif val_help
+  * Loopback address node cleanup
+  * Convert tunnel parameters to new help format
+  * Convert public-keys help to new format
+  * Revise static-host-mapping
+  * Use val_help: features to format better
+  * Convert syslog commands to new CLI help style
+
+  [ An-Cheng Huang ]
+  * fix typo, val_help, etc.
+
+  [ Stephen Hemminger ]
+  * Convert VRRP preempt to bool
+  * Convert VRRP to new CLI help style
+
+  [ Bob Gilligan ]
+  * Bugfix 5512: Have grub.cfg use the vmlinuz and initrd.img symlinks
+    if available
+
+ -- Bob Gilligan <gilligan@vyatta.com>  Mon, 19 Jul 2010 17:45:16 -0700
+
 vyatta-cfg-system (0.17.69) unstable; urgency=low
 
   [ Stephen Hemminger ]
diff --git a/scripts/vyatta-grub-setup b/scripts/vyatta-grub-setup
index 83a1c1f9..0c83ff4d 100755
--- a/scripts/vyatta-grub-setup
+++ b/scripts/vyatta-grub-setup
@@ -26,6 +26,15 @@
 #
 #
 
+#
+# Usage:
+#
+#  vyatta-grub-setup [ -u <livedir> ] [ -v <version> ]
+#
+# The -u and -v flags are mutually exclusive.
+#
+
+
 # The OS version we are installing
 version=""
 
@@ -206,52 +215,65 @@ fi
        done
     fi
 
-    if [ -f "$ROOTFSDIR/boot/vmlinuz" ] && ! eval $UNION ; then
-       # Set first system boot option.  Make KVM the default console in this one.
-       echo -e "menuentry \"Vyatta $version (KVM console)\" {"
-       echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $VGA_LOGO $vty_console"
-       echo -e  "\tinitrd /boot/initrd.img"
-       echo -e "}"
-  
-       # Set the second system boot option.  Make the serial port be the default
-       # console in this one.
-       echo
-       echo -e "menuentry \"Vyatta $version (Serial console)\" {"
-       echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $serial_console"
-       echo -e  "\tinitrd /boot/initrd.img"
-       echo -e "}"
-    fi
+    if eval "$UNION"; then
+	# UNION case
+	if [ -e "$ROOTFSDIR/boot/$livedir/vmlinuz" -a \
+	     -e "$ROOTFSDIR/boot/$livedir/initrd.img" ]; then
+            echo
+            echo -e "menuentry \"Vyatta $version linux (KVM console)\" {"
+            echo -e "\tlinux /boot/$livedir/vmlinuz $GRUB_OPTIONS $VGA_LOGO $vty_console"
+            echo -e  "\tinitrd /boot/$livedir/initrd.img"
+            echo -e "}"
+            echo
+            echo -e "menuentry \"Vyatta $version linux (Serial console)\" {"
+            echo -e "\tlinux /boot/$livedir/vmlinuz $GRUB_OPTIONS $serial_console"
+            echo -e  "\tinitrd /boot/$livedir/initrd.img"
+            echo -e "}"
+	    
+	elif [ -n "$union_kernel_versions" ]; then
+	    for kversion in $union_kernel_versions; do
+		echo
+		echo -e "menuentry \"Vyatta $version linux$kversion (KVM console)\" {"
+		echo -e "\tlinux /boot/$livedir/vmlinuz$kversion $GRUB_OPTIONS $VGA_LOGO $vty_console"
+		echo -e  "\tinitrd /boot/$livedir/initrd.img$kversion"
+		echo -e "}"
+		echo
+		echo -e "menuentry \"Vyatta $version linux$kversion (Serial console)\" {"
+		echo -e "\tlinux /boot/$livedir/vmlinuz$kversion $GRUB_OPTIONS $serial_console"
+		echo -e  "\tinitrd /boot/$livedir/initrd.img$kversion"
+		echo -e "}"
+	    done
+	fi
+    else
+	# Non-UNION case
+	if [ -f "$ROOTFSDIR/boot/vmlinuz" ]; then
+            # Set first system boot option.  Make KVM the default console in this one.
+	    echo -e "menuentry \"Vyatta $version (KVM console)\" {"
+	    echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $VGA_LOGO $vty_console"
+	    echo -e  "\tinitrd /boot/initrd.img"
+	    echo -e "}"
   
-    # create union kernels if they exist
-    if [ -n "$union_kernel_versions" ]; then
-       for kversion in $union_kernel_versions; do
-          echo
-          echo -e "menuentry \"Vyatta $version linux$kversion (KVM console)\" {"
-          echo -e "\tlinux /boot/$livedir/vmlinuz$kversion $GRUB_OPTIONS $VGA_LOGO $vty_console"
-          echo -e  "\tinitrd /boot/$livedir/initrd.img$kversion"
-          echo -e "}"
-          echo
-          echo -e "menuentry \"Vyatta $version linux$kversion (Serial console)\" {"
-          echo -e "\tlinux /boot/$livedir/vmlinuz$kversion $GRUB_OPTIONS $serial_console"
-          echo -e  "\tinitrd /boot/$livedir/initrd.img$kversion"
-          echo -e "}"
-       done
-    fi
-
-    # create other kernels if they exist
-    if [ -n "$kernel_versions" ]; then
-       for kversion in $kernel_versions; do
-          echo
-          echo -e "menuentry \"Vyatta $version linux$kversion (KVM console)\" {"
-          echo -e "\tlinux /boot/vmlinuz$kversion $GRUB_OPTIONS $VGA_LOGO $vty_console"
-          echo -e  "\tinitrd /boot/initrd.img$kversion"
-          echo -e "}"
-          echo
-          echo -e "menuentry \"Vyatta $version linux$kversion (Serial console)\" {"
-          echo -e "\tlinux /boot/vmlinuz$kversion $GRUB_OPTIONS $serial_console"
-          echo -e  "\tinitrd /boot/initrd.img$kversion"
-          echo -e "}"
-       done
+            # Set the second system boot option.  Make the serial port be the default
+            # console in this one.
+	    echo
+	    echo -e "menuentry \"Vyatta $version (Serial console)\" {"
+	    echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $serial_console"
+	    echo -e  "\tinitrd /boot/initrd.img"
+	    echo -e "}"
+	elif [ -n "$kernel_versions" ]; then
+	    for kversion in $kernel_versions; do
+		echo
+		echo -e "menuentry \"Vyatta $version linux$kversion (KVM console)\" {"
+		echo -e "\tlinux /boot/vmlinuz$kversion $GRUB_OPTIONS $VGA_LOGO $vty_console"
+		echo -e  "\tinitrd /boot/initrd.img$kversion"
+		echo -e "}"
+		echo
+		echo -e "menuentry \"Vyatta $version linux$kversion (Serial console)\" {"
+		echo -e "\tlinux /boot/vmlinuz$kversion $GRUB_OPTIONS $serial_console"
+		echo -e  "\tinitrd /boot/initrd.img$kversion"
+		echo -e "}"
+	    done
+	fi
     fi
 
     # Set options for root password reset.  Offer