diff options
| author | rbalocca <rbalocca@vyatta.com> | 2008-08-07 18:18:12 -0700 |
|---|---|---|
| committer | rbalocca <rbalocca@vyatta.com> | 2008-08-07 18:18:12 -0700 |
| commit | d2da6d1177bb0cb1922c2f2b73b8a4f557cece28 (patch) | |
| tree | 9193778f04b25a4e2aee81b6851b84800a3c0c98 /scripts | |
| parent | 2a49a4affae63864797a473b14def10824e2bc83 (diff) | |
| download | vyatta-cfg-system-d2da6d1177bb0cb1922c2f2b73b8a4f557cece28.tar.gz vyatta-cfg-system-d2da6d1177bb0cb1922c2f2b73b8a4f557cece28.zip | |
Fixes for bugs: http://bugzilla.vyatta.com/show_bug.cgi?id=3549 and http://bugzilla.vyatta.com/show_bug.cgi?id=3552
This fix involves removing multiple spaces between args on the kernel command line.
This fixes the symptom, but the root cause is an uninitialized variable in the grub-pc code,
so there is absolutely no guarrantee that this problem will not arrise again. The correct fix
is either to return to grub (V1) or to have the developers find and fix the unitialized memory.
Diffstat (limited to 'scripts')
| -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 ( |