openmamba/livecd-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Silvan Calarco 2012-01-26 13:23:51 +01:00
parent 0bac1eb055
commit f9d8281bff
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1,3 +1,3 @@
VERSION=2.5.0 VERSION=2.5.1

4
installer/installer.sh
View File

@ -489,7 +489,7 @@ if [ "$INSTALL_BOOTLOADER_DEVICE" ]; then
GRUB_OTHER_DEVICES=() GRUB_OTHER_DEVICES=()
for i in ${INSTALL_BOOTLOADER_CHAINLOAD[*]}; do for i in ${INSTALL_BOOTLOADER_CHAINLOAD[*]}; do
# FIXME: missing conversion from device to grub (hdx,y) form # 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` eval `blkid $i -o udev`
if [ "$ID_FS_UUID" ]; then if [ "$ID_FS_UUID" ]; then
if [ "$ID_FS_TYPE" = "ntfs" ]; then if [ "$ID_FS_TYPE" = "ntfs" ]; then
@ -502,7 +502,7 @@ if [ "$INSTALL_BOOTLOADER_DEVICE" ]; then
[ "$ID_FS_LABEL" ] && [ "$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 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_DEVICES=(${GRUB_OTHER_DEVICES[*]} /dev/disk/by-uuid/$ID_FS_UUID)
GRUB_OTHER_TITLES=(${GRUB_OTHER_TITLES[*]} "\"$ID_FS_LABEL\"") GRUB_OTHER_TITLES=(${GRUB_OTHER_TITLES[*]} "\"$ID_FS_LABEL\"")
else else