proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-08-10 01:42:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix comma-separation in handling of grub-pc/install_devices.

Browse Source
This commit is contained in:
Colin Watson 2010-11-26 12:23:24 +00:00
parent a4599161f9
commit b989599c85
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
grub2 (1.99~20101124-2) UNRELEASED; urgency=low
* Fix comma-separation in handling of grub-pc/install_devices.
-- Colin Watson <cjwatson@debian.org> Fri, 26 Nov 2010 12:23:06 +0000
grub2 (1.99~20101124-1) experimental; urgency=low grub2 (1.99~20101124-1) experimental; urgency=low
* New Bazaar snapshot (command priorities, build fixes, grub-mkdevicemap * New Bazaar snapshot (command priorities, build fixes, grub-mkdevicemap

6
debian/postinst.in vendored
View File

@ -387,7 +387,7 @@ case "$1" in
test "$(uname -s)" = Linux; then test "$(uname -s)" = Linux; then
# Migrate to new by-id naming scheme. # Migrate to new by-id naming scheme.
db_get grub-pc/install_devices db_get grub-pc/install_devices
old_devices="$RET" old_devices="$(echo "$RET" | sed 's/, / /g')"
new_devices= new_devices=
# Common-case optimisation: if the list of devices is # Common-case optimisation: if the list of devices is
# identical to the LHS of grub-mkdevicemap's output, then # identical to the LHS of grub-mkdevicemap's output, then
@ -443,7 +443,7 @@ case "$1" in
db_get grub-pc/install_devices db_get grub-pc/install_devices
valid=1 valid=1
for device in $RET; do for device in $RET; do
if [ ! -e "$device" ]; then if [ ! -e "${device%,}" ]; then
valid=0 valid=0
break break
fi fi
@ -500,7 +500,7 @@ case "$1" in
db_go db_go
db_get "$question" db_get "$question"
failed_devices= failed_devices=
for i in `echo $RET | sed -e 's/,/ /g'` ; do for i in `echo $RET | sed -e 's/, / /g'` ; do
real_device="$(readlink -f "$i")" real_device="$(readlink -f "$i")"
if grub-install --force --no-floppy $real_device ; then if grub-install --force --no-floppy $real_device ; then
# We just installed GRUB 2; then also generate grub.cfg. # We just installed GRUB 2; then also generate grub.cfg.