From: Philippe Coval <philippe.coval@open.eurogiciel.org>
Date: Wed, 12 Nov 2014 10:17:53 +0000 (+0100)
Subject: bios: also support system with no /boot part
X-Git-Tag: accepted/tizen/common/20141115.192007^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Fsandbox%2Fpcoval%2Ftizen;p=platform%2Fadaptation%2Fsetup-scripts.git

bios: also support system with no /boot part

Tested on single partition system at least

Change-Id: I5bf219aaaff556184295b0bbeaf779c8aea8e98b
Bug-Tizen: TC-1873/part
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
---

diff --git a/setup-extlinux-conf b/setup-extlinux-conf
index f06c95e..2d5ce96 100755
--- a/setup-extlinux-conf
+++ b/setup-extlinux-conf
@@ -211,7 +211,7 @@ add_subcommand()
 
 	local block="label $label
 	menu label $title ($kernel_version)
-	linux /$kernel
+	linux ../$kernel
 	append $options"
 
 	printf "\n%s\n" "$block" >> "$conf_file"
diff --git a/setup-scripts-boot b/setup-scripts-boot
index e050dd9..e1dc8cf 100755
--- a/setup-scripts-boot
+++ b/setup-scripts-boot
@@ -80,6 +80,10 @@ install_extlinux()
 	# Get device node name for the boot partition
 	local boot_devnode
 	installerfw_get_part_info "/boot" "DEVNODE_NOW" "boot_devnode"
+	if [ ! -n "$boot_devnode" ] ; then
+	    verbose "No /boot part, fallback to /"
+		installerfw_get_part_info "/" "DEVNODE_NOW" "boot_devnode"
+	fi
 	[ -n "$boot_devnode" ] || \
 		fatal "cannot find device node of the boot disk, probably" \
 		      "INSTALLERFW_PARTx_DEVNODE_NOW environment" \
@@ -97,6 +101,10 @@ install_extlinux()
 	# Get device node name for the boot disk
 	local mbr_devnode
 	installerfw_get_part_info "/boot" "DISK_DEVNODE_NOW" "mbr_devnode"
+	if [ !  -n "$mbr_devnode" ] ; then
+	    verbose "No /boot disk, fallback to /"
+	    installerfw_get_part_info "/" "DISK_DEVNODE_NOW" "mbr_devnode"
+	fi
 	[ -n "$mbr_devnode" ] || \
 		fatal "cannot find device node of the boot disk, probably" \
 		      "INSTALLERFW_PARTx_DISK_DEVNODE_NOW environment" \