vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/grub.d/00_header.in: Add some more quoting (of

Browse source 
"${prev_saved_entry}" and "${boot_once}") needed to make savedefault
work again.
Reported by: Mario 'BitKoenig' Holbe (Debian bug #584812).
This commit is contained in:
Colin Watson 2010-06-07 14:22:40 +01:00
parent db8fa1ad87
commit e1cbcc40a4
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2010-06-07 Colin Watson <cjwatson@ubuntu.com>
* util/grub.d/00_header.in: Add some more quoting (of
"${prev_saved_entry}" and "${boot_once}") needed to make savedefault
work again.
Reported by: Mario 'BitKoenig' Holbe (Debian bug #584812).
2010-06-07 Colin Watson <cjwatson@ubuntu.com> 2010-06-07 Colin Watson <cjwatson@ubuntu.com>
* util/grub-mkpasswd-pbkdf2.c (main): Rename top-level `c' variable * util/grub-mkpasswd-pbkdf2.c (main): Rename top-level `c' variable

4
util/grub.d/00_header.in
View file

@ -61,7 +61,7 @@ set default="${GRUB_DEFAULT}"
EOF EOF
fi fi
cat <<EOF cat <<EOF
if [ \${prev_saved_entry} ]; then if [ "\${prev_saved_entry}" ]; then
set saved_entry="\${prev_saved_entry}" set saved_entry="\${prev_saved_entry}"
save_env saved_entry save_env saved_entry
set prev_saved_entry= set prev_saved_entry=
@ -70,7 +70,7 @@ if [ \${prev_saved_entry} ]; then
fi fi
function savedefault { function savedefault {
if [ -z \${boot_once} ]; then if [ -z "\${boot_once}" ]; then
saved_entry="\${chosen}" saved_entry="\${chosen}"
save_env saved_entry save_env saved_entry
fi fi