diff options
| author | Mohit Mehta <mohit.mehta@vyatta.com> | 2008-08-06 22:17:29 +0000 |
|---|---|---|
| committer | Mohit Mehta <mohit.mehta@vyatta.com> | 2008-08-06 22:17:29 +0000 |
| commit | 6c6f88e7bca27a3695ae017236ec45290fcf5706 (patch) | |
| tree | 95ee0128c1ee3df75b195aaf4b77b2e45060148d | |
| parent | dc4d53c9eb42a6f9f27f0de762de85ce46b6f788 (diff) | |
| parent | 3c1c49056fbb970a943464317beb883700a7401f (diff) | |
| download | vyatta-cfg-system-6c6f88e7bca27a3695ae017236ec45290fcf5706.tar.gz vyatta-cfg-system-6c6f88e7bca27a3695ae017236ec45290fcf5706.zip | |
Merge branch 'islavista' of mohit@git.vyatta.com:/git/vyatta-cfg-system into islavista
| -rwxr-xr-x | scripts/grub-setup | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/scripts/grub-setup b/scripts/grub-setup index c954e465..1e6751d9 100755 --- a/scripts/grub-setup +++ b/scripts/grub-setup @@ -33,7 +33,12 @@ ROOTFSDIR="$3" [ "$ROOT_PARTITION" ] || exit 1 # Grub options -GRUB_OPTIONS="$GRUB_OPTIONS quiet" +if [ "$GRUB_OPTIONS" ] +then + GRUB_OPTIONS="$GRUB_OPTIONS quiet" +else + GRUB_OPTIONS=quiet +fi # Path to standalone root password reset script pass_reset=/opt/vyatta/sbin/standalone_root_pw_reset @@ -54,7 +59,7 @@ serial_console="console=tty0 console=ttyS0,9600" # 65000 (16bit) | 785 788 791 794 # 16.7 Mill.(24bit)| 786 789 792 795 # - vga_logo="vga=785" +vga_logo="vga=785" # get list of kernels, except Xen kernel_versions=$(ls /boot/vmlinuz-* 2> /dev/null | grep -v xen | sed 's:/boot/vmlinuz::g' | sort -r) @@ -81,7 +86,12 @@ serial_console="console=tty0 console=ttyS0,9600" echo "Unable to read filesystem UUID. Exiting." exit 1 else - GRUB_OPTIONS="$GRUB_OPTIONS root=UUID=$uuid ro" + if [ "$GRUB_OPTIONS" ] + then + GRUB_OPTIONS="$GRUB_OPTIONS root=UUID=$uuid ro" + else + GRUB_OPTIONS="root=UUID=$uuid ro" + fi fi ( |