| Message ID | 1388338428-19833-3-git-send-email-thomas.petazzoni@free-electrons.com |
|---|---|
| State | Accepted |
| Headers | show |
Thomas, All, On 2013-12-29 18:33 +0100, Thomas Petazzoni spake thusly: > When Grub is built with splashscreen support, copy the splashscreen > image to the ISO9660 filesystem. Otherwise, disable the splashscreen > in the grub menu.lst file. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > fs/iso9660/iso9660.mk | 5 +++++ > fs/iso9660/menu.lst | 11 ++++++++++- > 2 files changed, 15 insertions(+), 1 deletion(-) > > diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk > index 56e87bb..0260d41 100644 > --- a/fs/iso9660/iso9660.mk > +++ b/fs/iso9660/iso9660.mk > @@ -16,6 +16,11 @@ $(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-cpio grub > mkdir -p $(ISO9660_TARGET_DIR)/boot/grub > cp $(GRUB_DIR)/stage2/stage2_eltorito $(ISO9660_TARGET_DIR)/boot/grub/ > cp $(ISO9660_BOOT_MENU) $(ISO9660_TARGET_DIR)/boot/grub/menu.lst > +ifeq ($(BR2_TARGET_GRUB_SPLASH),) > + $(SED) '/splashimage/d' $(ISO9660_TARGET_DIR)/boot/grub/menu.lst This would also get rid of the comments, but keep foreground/background untouched. Maybe: /^splashimage/d > +else > + cp boot/grub/splash.xpm.gz $(ISO9660_TARGET_DIR)/ > +endif > cp $(LINUX_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel > ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y) > $(SED) '/initrd/d' $(ISO9660_TARGET_DIR)/boot/grub/menu.lst > diff --git a/fs/iso9660/menu.lst b/fs/iso9660/menu.lst > index ed7836a..c0bbff6 100644 > --- a/fs/iso9660/menu.lst > +++ b/fs/iso9660/menu.lst > @@ -1,6 +1,15 @@ > default 0 > timeout 10 > -color cyan/blue white/blue > + > +# Used when no splashimage is used > +color cyan/blue white/blue > + > +# Gets enabled/disabled depending on Grub support for splashimage > +splashimage /splash.xpm.gz > + > +# Used when a splashimage is enabled > +foreground 000000 > +background cccccc > > title Buildroot ISO9660 image > kernel /kernel With that fixed: Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Regards, Yann E. MORIN.
diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk index 56e87bb..0260d41 100644 --- a/fs/iso9660/iso9660.mk +++ b/fs/iso9660/iso9660.mk @@ -16,6 +16,11 @@ $(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux rootfs-cpio grub mkdir -p $(ISO9660_TARGET_DIR)/boot/grub cp $(GRUB_DIR)/stage2/stage2_eltorito $(ISO9660_TARGET_DIR)/boot/grub/ cp $(ISO9660_BOOT_MENU) $(ISO9660_TARGET_DIR)/boot/grub/menu.lst +ifeq ($(BR2_TARGET_GRUB_SPLASH),) + $(SED) '/splashimage/d' $(ISO9660_TARGET_DIR)/boot/grub/menu.lst +else + cp boot/grub/splash.xpm.gz $(ISO9660_TARGET_DIR)/ +endif cp $(LINUX_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y) $(SED) '/initrd/d' $(ISO9660_TARGET_DIR)/boot/grub/menu.lst diff --git a/fs/iso9660/menu.lst b/fs/iso9660/menu.lst index ed7836a..c0bbff6 100644 --- a/fs/iso9660/menu.lst +++ b/fs/iso9660/menu.lst @@ -1,6 +1,15 @@ default 0 timeout 10 -color cyan/blue white/blue + +# Used when no splashimage is used +color cyan/blue white/blue + +# Gets enabled/disabled depending on Grub support for splashimage +splashimage /splash.xpm.gz + +# Used when a splashimage is enabled +foreground 000000 +background cccccc title Buildroot ISO9660 image kernel /kernel
When Grub is built with splashscreen support, copy the splashscreen image to the ISO9660 filesystem. Otherwise, disable the splashscreen in the grub menu.lst file. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- fs/iso9660/iso9660.mk | 5 +++++ fs/iso9660/menu.lst | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)