keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

05live.cfg: drop "splash" by default

Browse Source 
It's configured by plymouth feature when needed;
install2 bootargs support is generalized a bit
to become stage2 one as was intended anyways.
This commit is contained in:
Michael Shigorin 2012-06-21 19:06:23 +03:00
parent 83b7ca6982
commit aa0f5c94e4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features.in/plymouth/config.mk
View File

@ -18,9 +18,9 @@ use/plymouth/stage2: use/plymouth use/branding \
@$(call add,STAGE1_PACKAGES_REGEXP,make-initrd-plymouth)
@$(call add,STAGE1_BRANDING,bootsplash)
@$(call add,STAGE2_BRANDING,bootsplash)
@$(call add,STAGE2_BOOTARGS,quiet splash)
use/plymouth/base: use/plymouth use/install2/kms
@$(call add,INSTALL2_BOOTARGS,quiet splash)
use/plymouth/base: use/plymouth/stage2 use/install2/kms
@$(call add,INSTALL2_PACKAGES,installer-feature-setup-plymouth)
@$(call add,BASE_PACKAGES_REGEXP,make-initrd-plymouth cpio)
@$(call add,THE_BRANDING,bootsplash)

2
features.in/syslinux/cfg.in/05live.cfg
View File

@ -1,5 +1,5 @@
label live
menu label ^LiveCD (no hard disk needed)
kernel alt0/vmlinuz
append initrd=alt0/full.cz fastboot live lowmem showopts automatic=method:cdrom ramdisk_size=@live_size@ stagename=live splash quiet=1 vga=0x314
append initrd=alt0/full.cz fastboot live lowmem showopts automatic=method:cdrom ramdisk_size=@live_size@ stagename=live vga=0x314 @bootargs@

4
features.in/syslinux/generate.mk
View File

@ -65,8 +65,8 @@ timeout: bootargs
# pass over additional parameters, if any
bootargs: clean
@if [ -n "$(INSTALL2_BOOTARGS)" ]; then \
sed -i "s,@bootargs@,$(INSTALL2_BOOTARGS)," $(DSTDIR)/*.cfg; \
@if [ -n "$(STAGE2_BOOTARGS)" ]; then \
sed -i "s,@bootargs@,$(STAGE2_BOOTARGS)," $(DSTDIR)/*.cfg; \
fi; \
sed -i "s,@bootargs@,," $(DSTDIR)/*.cfg