mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-02-02 15:31:06 +02:00
fix grub bootopts (#1145)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6019 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
4a834421b0
commit
37e7745ef1
@ -30,7 +30,7 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
|
||||
endef
|
||||
|
||||
define Image/cmdline/ext2
|
||||
root=$(ROOTPART) rootfstype=ext2 $(CONFIG_X86_GRUB_BOOTOPTS)
|
||||
root=$(ROOTPART) rootfstype=ext2
|
||||
endef
|
||||
|
||||
define Image/Build/grub
|
||||
@ -42,7 +42,7 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
|
||||
$(KDIR)/root.grub/boot/grub/
|
||||
$(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $(KDIR)/root.grub/boot/vmlinuz
|
||||
sed \
|
||||
-e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)))#g' \
|
||||
-e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(CONFIG_X86_GRUB_BOOTOPTS)#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_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
|
||||
|
Loading…
x
Reference in New Issue
Block a user