Commit b1cd8ec3 authored by Anton Midyukov's avatar Anton Midyukov

plymouth: add SPLASH_ARGS to be able to override

parent b22efffc
...@@ -5,3 +5,8 @@ ...@@ -5,3 +5,8 @@
с фичей branding по объективным причинам, но оформлена отдельно с фичей branding по объективным причинам, но оформлена отдельно
для возможности собирать образы с частичным брендированием либо для возможности собирать образы с частичным брендированием либо
"без излишеств". "без излишеств".
Аргументы kernel cmdline 'quiet splash' можно переопределить
в переменной SPLASH_ARGS, например так:
@$(call set,SPLASH_ARGS,splash)
...@@ -7,6 +7,7 @@ use/plymouth/install2: use/plymouth/stage2; @: ...@@ -7,6 +7,7 @@ use/plymouth/install2: use/plymouth/stage2; @:
use/plymouth: use/plymouth:
@$(call add_feature) @$(call add_feature)
@$(call try,SPLASH_ARGS,quiet splash)
# NB: *_REGEXP due to branding() using regexp and the # NB: *_REGEXP due to branding() using regexp and the
# dependency resolution having to occur within a # dependency resolution having to occur within a
...@@ -20,7 +21,7 @@ use/plymouth/stage2: use/plymouth use/branding \ ...@@ -20,7 +21,7 @@ use/plymouth/stage2: use/plymouth use/branding \
@$(call add,STAGE1_PACKAGES,make-initrd-plymouth) @$(call add,STAGE1_PACKAGES,make-initrd-plymouth)
@$(call add,STAGE1_BRANDING,bootsplash graphics) @$(call add,STAGE1_BRANDING,bootsplash graphics)
@$(call add,STAGE2_BRANDING,bootsplash graphics) @$(call add,STAGE2_BRANDING,bootsplash graphics)
@$(call add,STAGE2_BOOTARGS,quiet splash) @$(call add,STAGE2_BOOTARGS,$$(SPLASH_ARGS))
else else
use/plymouth/stage2: use/plymouth use/branding; @: use/plymouth/stage2: use/plymouth use/branding; @:
endif endif
...@@ -32,7 +33,7 @@ endif ...@@ -32,7 +33,7 @@ endif
@$(call add,THE_BRANDING,bootsplash graphics) @$(call add,THE_BRANDING,bootsplash graphics)
@$(call add,BASE_PACKAGES,make-initrd-plymouth cpio) @$(call add,BASE_PACKAGES,make-initrd-plymouth cpio)
ifeq (vm,$(IMAGE_CLASS)) ifeq (vm,$(IMAGE_CLASS))
@$(call add,BASE_BOOTARGS,quiet splash) @$(call add,BASE_BOOTARGS,$$(SPLASH_ARGS))
endif endif
use/plymouth/full: use/plymouth/stage2 use/plymouth/base; @: use/plymouth/full: use/plymouth/stage2 use/plymouth/base; @:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment