summaryrefslogtreecommitdiff
path: root/scripts/install-system
diff options
context:
space:
mode:
authorBob Gilligan <gilligan@vyatta.com>2010-02-08 12:02:18 -0800
committerBob Gilligan <gilligan@vyatta.com>2010-02-08 12:02:18 -0800
commit3f6bb58b0f98f8ca9dd986f8f274906c33596083 (patch)
tree7ec3c7ae4fbdf518560c49ba98d6e7e9747dc9f0 /scripts/install-system
parentd1c814b29aeb7dd2b581a4ffea23bde61331bcf5 (diff)
downloadvyatta-cfg-quagga-3f6bb58b0f98f8ca9dd986f8f274906c33596083.tar.gz
vyatta-cfg-quagga-3f6bb58b0f98f8ca9dd986f8f274906c33596083.zip
Bugfix 5225: Include the OS version number in the grub menu entry.
Diffstat (limited to 'scripts/install-system')
-rwxr-xr-xscripts/install-system6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/install-system b/scripts/install-system
index d214d93d..bc2277fd 100755
--- a/scripts/install-system
+++ b/scripts/install-system
@@ -1015,11 +1015,15 @@ install_grub () {
fi
fi
+ version=$(egrep -i version /opt/vyatta/etc/version | awk '{ print $3 }')
+
# if union install tell vyatta-grub-setup
if [ ! -z $UNION ]; then
- version=$(egrep -i version /opt/vyatta/etc/version | awk '{ print $3 }')
grub_args="-u $version"
+ else
+ grub_args="-v $version"
fi
+
if /opt/vyatta/sbin/vyatta-grub-setup $grub_args "$ROOT_PARTITION" "$grub_options" /mnt/rootfs >>$INSTALL_LOG
then
echo "OK"