X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5cd5287c63bd0be72b4ae00fc1af508a2b42e541..58c8f8ef5a038b47e39f7b8c9662493f4cde1317:/target/image/x86/Makefile diff --git a/target/image/x86/Makefile b/target/image/x86/Makefile index b836f3ace..8c0cde440 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 @@ -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