From c41b01ea232db92f9970cdaafe2c85c76055f4df Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 22 Jun 2011 18:22:58 +0000 Subject: [PATCH] * Canonicalize boot.loader.grub.device before calling grub-install to ensure that values such as /dev/disk/by-id/ata-WDC... work. svn path=/nixos/trunk/; revision=27519 --- modules/system/activation/switch-to-configuration.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh index 3249ee3ea34..185a7f75b0b 100644 --- a/modules/system/activation/switch-to-configuration.sh +++ b/modules/system/activation/switch-to-configuration.sh @@ -38,13 +38,13 @@ if [ "$action" = "switch" -o "$action" = "boot" ]; then if [ "$NIXOS_INSTALL_GRUB" = 1 -o "$oldGrubVersion" != "$newGrubVersion" ]; then echo "installing the GRUB bootloader..." - @grub@/sbin/grub-install "@grubDevice@" --no-floppy + @grub@/sbin/grub-install "$(readlink -f "@grubDevice@")" --no-floppy echo "$newGrubVersion" > /boot/grub/version fi fi else - echo "Warning: don't know how to make this configuration bootable; please set \`boot.grubDevice'." 1>&2 + echo "Warning: don't know how to make this configuration bootable; please set \`boot.loader.grub.device'." 1>&2 fi elif [ "@bootLoader@" = "generationsDir" ]; then