diff options
Diffstat (limited to 'scripts/grub-setup')
| -rwxr-xr-x | scripts/grub-setup | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/scripts/grub-setup b/scripts/grub-setup index 10b1c936..be1e60f0 100755 --- a/scripts/grub-setup +++ b/scripts/grub-setup @@ -34,6 +34,12 @@ ROOTFSDIR="$3" # 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 @@ -81,7 +87,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 ( |