From 7e514fe0323c0699e744f40be78dbdea4bb28237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Tue, 19 Feb 2019 12:38:06 +0300 Subject: [PATCH] =?UTF-8?q?sys-boot/grub:=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82?= =?UTF-8?q?=D1=80=D1=8B=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B0=20ply?= =?UTF-8?q?mouth?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1-merge/sys-boot/grub/splash/default.grub | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splash/default.grub b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splash/default.grub index 47315978d..b5b3059be 100644 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splash/default.grub +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splash/default.grub @@ -12,11 +12,17 @@ GRUB_CMDLINE_LINUX="video=#-os_install_fb_resolution-# #-os_install_kernel_resum #pkg# #?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)!=# -#?ini(theme.splash-silent-background)!=&&exists(#-ini(theme.splash-silent-background)-#)!=# +#?ini(theme.splash-silent-picture)!=&&exists(#-ini(theme.splash-silent-picture)-#)!=&&ini(theme.splash-shutdown-picture)!=&&exists(#-ini(theme.splash-shutdown-picture)-#)!=# +GRUB_CMDLINE_LINUX="video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# #-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# splash quiet" +#ini# +#?ini(theme.splash-shutdown-picture)!=&&exists(#-ini(theme.splash-shutdown-picture)-#)!=&&ini(theme.splash-silent-picture)==||ini(theme.splash-shutdown-picture)!=&&exists(#-ini(theme.splash-shutdown-picture)-#)!=&&ini(theme.splash-silent-picture)!=&&exists(#-ini(theme.splash-silent-picture)-#)==# +GRUB_CMDLINE_LINUX="video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# #-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# splash=shutdown rd.plymouth=0 quiet" +#ini# +#?ini(theme.splash-silent-picture)!=&&exists(#-ini(theme.splash-silent-picture)-#)!=&&ini(theme.splash-shutdown-picture)==||ini(theme.splash-silent-picture)!=&&exists(#-ini(theme.splash-silent-picture)-#)!=&&ini(theme.splash-shutdown-picture)!=&&exists(#-ini(theme.splash-shutdown-picture)-#)==# GRUB_CMDLINE_LINUX="video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# #-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# splash=silent quiet" #ini# -#?ini(theme.splash-silent-background)==&&ini(theme.splash-verbose-background)==||ini(theme.splash-silent-background)==&&exists(#-ini(theme.splash-verbose-background)-#)==||ini(theme.splash-verbose-background)==&&exists(#-ini(theme.splash-silent-background)-#)==||exists(#-ini(theme.splash-verbose-background)-#)==&&exists(#-ini(theme.splash-silent-background)-#)==# -GRUB_CMDLINE_LINUX="video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# #-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# console=tty1 rd.plymouth=0 quiet" +#?ini(theme.splash-silent-picture)==&&ini(theme.splash-shutdown-picture)==||ini(theme.splash-silent-picture)!=&&exists(#-ini(theme.splash-silent-picture)-#)==&&ini(theme.splash-shutdown-picture)==||ini(theme.splash-silent-picture)==&&ini(theme.splash-shutdown-picture)!=&&exists(#-ini(theme.splash-shutdown-picture)-#)==||ini(theme.splash-silent-picture)!=&&exists(#-ini(theme.splash-silent-picture)-#)==&&ini(theme.splash-shutdown-picture)!=&&exists(#-ini(theme.splash-shutdown-picture)-#)==# +GRUB_CMDLINE_LINUX="video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# #-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# rd.plymouth=0 quiet" #ini# #pkg#