Commit f9d8281bff133b7259d2f886d3cff111879aa522

Authored by Silvan Calarco
1 parent 0bac1eb055
Exists in master and in 1 other branch milestone2

installer.sh: fix label in grub menu entries for other OSes

Showing 2 changed files with 4 additions and 4 deletions Side-by-side Diff

1   -VERSION=2.5.0
  1 +VERSION=2.5.1
installer/installer.sh
... ... @@ -489,7 +489,7 @@
489 489 GRUB_OTHER_DEVICES=()
490 490 for i in ${INSTALL_BOOTLOADER_CHAINLOAD[*]}; do
491 491 # FIXME: missing conversion from device to grub (hdx,y) form
492   - unset ID_FS_UUID
  492 + unset ID_FS_UUID ID_FS_TYPE ID_FS_LABEL
493 493 eval `blkid $i -o udev`
494 494 if [ "$ID_FS_UUID" ]; then
495 495 if [ "$ID_FS_TYPE" = "ntfs" ]; then
496 496  
... ... @@ -500,9 +500,9 @@
500 500 ID_FS_LABEL="Win/DOS ($ID_FS_LABEL)" || ID_FS_LABEL="Windows/DOS"
501 501 else
502 502 [ "$ID_FS_LABEL" ] &&
503   - ID_FS_LABEL="Other OS ($ID_FS_LABEL)" || ID_FS_LABEL="Other OS"
  503 + ID_FS_LABEL="Other OS ($ID_FS_LABEL)" || ID_FS_LABEL="Other OS"
504 504 fi
505   - [ "$ID_FS_LABEL" ] || ID_FS_LABEL="W"
  505 + [ "$ID_FS_LABEL" ] || ID_FS_LABEL="Unknown"
506 506 GRUB_OTHER_DEVICES=(${GRUB_OTHER_DEVICES[*]} /dev/disk/by-uuid/$ID_FS_UUID)
507 507 GRUB_OTHER_TITLES=(${GRUB_OTHER_TITLES[*]} "\"$ID_FS_LABEL\"")
508 508 else