From 145ed685731972bce9a7dee08fd22af137ac5555 Mon Sep 17 00:00:00 2001
From: Tim Yardley <lst@openwrt.org>
Date: Tue, 24 Oct 2006 22:33:23 +0000
Subject: code to bring in the following for x86:     X86_GRUB_ROOTPART:
 configureable root partition for kernel options     X86_GRUB_BOOTOPTS:
 configureable parameters to be added to the boot line

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5289 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/image/x86/Config.in | 13 +++++++++++++
 target/image/x86/Makefile  |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'target')

diff --git a/target/image/x86/Config.in b/target/image/x86/Config.in
index 88d8d37c3b..2c3e8840cc 100644
--- a/target/image/x86/Config.in
+++ b/target/image/x86/Config.in
@@ -14,4 +14,17 @@ config X86_GRUB_KERNELPART
 	depends X86_GRUB_IMAGES
 	default 4
 
+config X86_GRUB_ROOTPART
+    string
+    prompt "Root partition on target device" if X86_GRUB_IMAGES
+    default "/dev/hda2"
+    help
+        The root partition on the final device.  If you don't know, 
+        you probably want the default (/dev/hda2).
 
+config X86_GRUB_BOOTOPTS
+    string
+    prompt "Extra kernel boot options" if X86_GRUB_IMAGES
+    default ""
+    help
+        If you don't know leave it blank
diff --git a/target/image/x86/Makefile b/target/image/x86/Makefile
index 0860245453..8c0cde440f 100644
--- a/target/image/x86/Makefile
+++ b/target/image/x86/Makefile
@@ -25,7 +25,7 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
   endef
 
   define Image/cmdline/ext2
-    root=/dev/hda2 rootfstype=ext2
+    root=$(CONFIG_X86_GRUB_ROOTPART) rootfstype=ext2 $(CONFIG_X86_GRUB_BOOTOPTS)
   endef
 
   define Image/Build/grub
-- 
cgit v1.2.3