From f9d8281bff133b7259d2f886d3cff111879aa522 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Thu, 26 Jan 2012 13:23:51 +0100 Subject: [PATCH] installer.sh: fix label in grub menu entries for other OSes --- VERSION | 2 +- installer/installer.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index ea3a661..b7d790e 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ -VERSION=2.5.0 +VERSION=2.5.1 diff --git a/installer/installer.sh b/installer/installer.sh index 387c714..c5f0101 100755 --- a/installer/installer.sh +++ b/installer/installer.sh @@ -489,7 +489,7 @@ if [ "$INSTALL_BOOTLOADER_DEVICE" ]; then GRUB_OTHER_DEVICES=() for i in ${INSTALL_BOOTLOADER_CHAINLOAD[*]}; do # FIXME: missing conversion from device to grub (hdx,y) form - unset ID_FS_UUID + unset ID_FS_UUID ID_FS_TYPE ID_FS_LABEL eval `blkid $i -o udev` if [ "$ID_FS_UUID" ]; then if [ "$ID_FS_TYPE" = "ntfs" ]; then @@ -500,9 +500,9 @@ if [ "$INSTALL_BOOTLOADER_DEVICE" ]; then ID_FS_LABEL="Win/DOS ($ID_FS_LABEL)" || ID_FS_LABEL="Windows/DOS" else [ "$ID_FS_LABEL" ] && - ID_FS_LABEL="Other OS ($ID_FS_LABEL)" || ID_FS_LABEL="Other OS" + ID_FS_LABEL="Other OS ($ID_FS_LABEL)" || ID_FS_LABEL="Other OS" fi - [ "$ID_FS_LABEL" ] || ID_FS_LABEL="W" + [ "$ID_FS_LABEL" ] || ID_FS_LABEL="Unknown" GRUB_OTHER_DEVICES=(${GRUB_OTHER_DEVICES[*]} /dev/disk/by-uuid/$ID_FS_UUID) GRUB_OTHER_TITLES=(${GRUB_OTHER_TITLES[*]} "\"$ID_FS_LABEL\"") else