From a8045ac8ed24356e6d6431010811043f87a1b37f Mon Sep 17 00:00:00 2001
From: An-Cheng Huang <ancheng@vyatta.com>
Date: Thu, 5 Nov 2009 19:03:09 -0800
Subject: use new vyatta-union arg to reduce kernel cmdline length.
---
scripts/vyatta-grub-setup | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/scripts/vyatta-grub-setup b/scripts/vyatta-grub-setup
index 817223b3..487356c4 100755
--- a/scripts/vyatta-grub-setup
+++ b/scripts/vyatta-grub-setup
@@ -88,7 +88,7 @@ else
fi
if eval "$UNION"; then
- GRUB_OPTIONS="boot=live live-media-path=/boot/$livedir persistent-path=/boot/$livedir quiet persistent noautologin nonetworking nouser hostname=vyatta"
+ GRUB_OPTIONS="boot=live quiet vyatta-union=/boot/$livedir"
union_xen_kernel_version=$(ls $ROOTFSDIR/boot/$livedir/vmlinuz*-xen* \
2>/dev/null \
| awk -F/ '{ print $6 }' \
@@ -253,17 +253,21 @@ fi
# Set options for root password reset. Offer
# options for both serial and KVM console.
+ reset_boot_path=/boot
+ if eval "$UNION"; then
+ reset_boot_path=/boot/$livedir
+ fi
echo
echo -e "menuentry \"Lost password change (KVM console)\" {"
- echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $vga_logo $vty_console init=$pass_reset"
- echo -e "\tinitrd /boot/initrd.img"
+ echo -e "\tlinux $reset_boot_path/vmlinuz $GRUB_OPTIONS $vga_logo $vty_console init=$pass_reset"
+ echo -e "\tinitrd $reset_boot_path/initrd.img"
echo -e "}"
echo
echo -e "menuentry \"Lost password change (Serial console)\" {"
- echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $serial_console init=$pass_reset"
- echo -e "\tinitrd /boot/initrd.img"
+ echo -e "\tlinux $reset_boot_path/vmlinuz $GRUB_OPTIONS $serial_console init=$pass_reset"
+ echo -e "\tinitrd $reset_boot_path/initrd.img"
echo -e "}"
if [ -n "$diag_drive_number" ]; then
--
cgit v1.2.3