summaryrefslogtreecommitdiffstats
path: root/target/image/x86
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-10-19 03:27:24 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-10-19 03:27:24 +0000
commit00b9fc10fe104cb6b4c835fdf19f739121722ed6 (patch)
tree112c74ed8cf294246ade0f6b76561b866a238493 /target/image/x86
parent8a7ccc3ff97c236f809f5b0fc067512307792570 (diff)
make filesystem size selection generic (for ext2)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5221 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/image/x86')
-rw-r--r--target/image/x86/Config.in5
-rw-r--r--target/image/x86/Makefile2
2 files changed, 2 insertions, 5 deletions
diff --git a/target/image/x86/Config.in b/target/image/x86/Config.in
index fa61468c9..88d8d37c3 100644
--- a/target/image/x86/Config.in
+++ b/target/image/x86/Config.in
@@ -14,7 +14,4 @@ config X86_GRUB_KERNELPART
depends X86_GRUB_IMAGES
default 4
-config X86_GRUB_FSPART
- int "Filesystem partition size (in MB)"
- depends X86_GRUB_IMAGES
- default 16
+
diff --git a/target/image/x86/Makefile b/target/image/x86/Makefile
index b836f3ace..086024545 100644
--- a/target/image/x86/Makefile
+++ b/target/image/x86/Makefile
@@ -40,7 +40,7 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
-e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)))#g' \
-e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \
./grub/menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst
- PATH="$(STAGING_DIR)/usr/sbin:$(STAGING_DIR)/bin:$(PATH)" ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_X86_GRUB_FSPART) $(KDIR)/root.$(1)
+ PATH="$(STAGING_DIR)/usr/sbin:$(STAGING_DIR)/bin:$(PATH)" ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
endef
endif