--- trunk/installer/include/prepare_bootloader.sh	2010/09/14 19:47:52	1156
+++ trunk/installer/include/prepare_bootloader.sh	2010/09/14 20:07:38	1157
@@ -76,12 +76,17 @@
 {
 	local splashimage
 	local grub_disk
+	local grub_prefix
 
 	if [[ -z ${PARTITION_DISK_BOOT} ]]
 	then
 		grub_disk="${PARTITION_DISK_ROOT}"
+		# if no extra partition for grub was defined, we need the bootprefix set to /boot
+		grub_prefix="/boot"
 	else
 		grub_disk="${PARTITION_DISK_BOOT}"
+		# got a extra boot partition, no bootprefix needed
+		grub_prefix=""
 	fi
 
 	# create an empty one
@@ -100,7 +105,7 @@
 	if [[ -f ${INSTALL_ROOT}/boot/${splashimage} ]]
 	then
 		add_grub_conf "# splash image"
-		add_grub_conf "splashimage $(convert_device ${grub_disk})/boot/${splashimage}"
+		add_grub_conf "splashimage $(convert_device ${grub_disk})${grub_prefix}/${splashimage}"
 		add_grub_conf "foreground FFFFFF"
 		add_grub_conf "background 253861"
 
@@ -113,8 +118,8 @@
 
 	add_grub_conf "title Magellan-Linux $(< ${INSTALL_ROOT}/etc/mageversion) ($(readlink ${INSTALL_ROOT}/boot/vmlinuz | sed s:kernel-::))"
 	add_grub_conf "root $(convert_device ${grub_disk})"
-	add_grub_conf "kernel /boot/$(readlink ${INSTALL_ROOT}/boot/vmlinuz) root=UUID=$(get_uuid ${PARTITION_DISK_ROOT})"
-	add_grub_conf "initrd /boot/$(readlink ${INSTALL_ROOT}/boot/initrd)"
+	add_grub_conf "kernel ${grub_prefix}/$(readlink ${INSTALL_ROOT}/boot/vmlinuz) root=UUID=$(get_uuid ${PARTITION_DISK_ROOT})"
+	add_grub_conf "initrd ${grub_prefix}/$(readlink ${INSTALL_ROOT}/boot/initrd)"
 
 	# add an empty line as spacer between other boot entries
 	add_grub_conf ""