From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EE20D1382C5 for ; Sat, 16 May 2020 06:53:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B5E6E09B1; Sat, 16 May 2020 06:53:41 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4714EE09B1 for ; Sat, 16 May 2020 06:53:40 +0000 (UTC) Received: by mail-pg1-f175.google.com with SMTP id r10so2094020pgv.8 for ; Fri, 15 May 2020 23:53:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vbQqD2p/QhOKYTM8jdwblLgo/0rT4nfO8SO7VEo5nxc=; b=liOwvDedjtF9qwCofYX/CXQ6nl82Jg7DK1P5EWOxVk7HoesskXi2SymcZspyuhdnWl VfXn+MfGf6vzoU35P5BKxXCBYtmQT5VXDYaDVFGZWe2QRykHK2hOgq2jCSPkY3Z/JCtn hQFBT3CFdpdHghdLxvhnZtMGoyXAB53VP10sWoGZPaPBml4MBh+RIm8kFU1hxyY4Wozm HIgBynLQPka5aLUywtlraLLU5r9ufRNieS14x2tcAxCaQIMX4rsk3urnbE7PmSVeqE4h 7j1RSwGI1wTqHTUmxOpLSozSDyvn/OAfLuWGsr9B8zDIgIs8bQQrqS5daOGL394y+hML RRPA== X-Gm-Message-State: AOAM530zmLKBJbei51V18mUZ+EEQKw/BmZo9TkfL6k19QANr5AiOJWSr 3kqKn7bfTrwAEbnPNaGLSTEMVNtD X-Google-Smtp-Source: ABdhPJwaTKIcGNJlR5aRXRzmsXAHOk63Svi4/gBoma2KL9QD9znVccx1MLNxJqgt9hsDYPeIzvzYMw== X-Received: by 2002:aa7:8091:: with SMTP id v17mr7589414pff.93.1589612018753; Fri, 15 May 2020 23:53:38 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id s5sm3008066pju.35.2020.05.15.23.53.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 May 2020 23:53:38 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 9/9] catalyst: Remove fbsplash support Date: Fri, 15 May 2020 23:53:17 -0700 Message-Id: <20200516065317.2678080-9-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200516065317.2678080-1-mattst88@gentoo.org> References: <20200516065317.2678080-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b196a0c6-edc2-439f-a8c5-16de4317b131 X-Archives-Hash: f0252e5530009f92f60a6509fab3b392 Depends on media-gfx/splashutils which was removed from Gentoo in November 2018. Signed-off-by: Matt Turner --- This is speculative. I've asked Whissi on IRC if my understanding is correct. catalyst/targets/livecd_stage2.py | 1 - catalyst/targets/stage4.py | 1 - doc/catalyst-spec.5.txt | 6 ------ examples/livecd-stage2_template.spec | 10 ++-------- examples/stage4_template.spec | 10 ++-------- targets/support/bootloader-setup.sh | 1 - targets/support/kmerge.sh | 15 --------------- targets/support/livecdfs-update.sh | 17 ----------------- targets/support/rc-update.sh | 2 -- 9 files changed, 4 insertions(+), 59 deletions(-) diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_st= age2.py index 22450645..88c0d95c 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -34,7 +34,6 @@ class livecd_stage2(StageBase): "livecd/readme", "livecd/rm", "livecd/root_overlay", - "livecd/splash_theme", "livecd/type", "livecd/unmerge", "livecd/users", diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py index 17719f0e..a9b3c936 100644 --- a/catalyst/targets/stage4.py +++ b/catalyst/targets/stage4.py @@ -16,7 +16,6 @@ class stage4(StageBase): valid_values =3D required_values | frozenset([ "boot/kernel", "portage_overlay", - "splash_theme", "stage4/empty", "stage4/fsscript", "stage4/gk_mainargs", diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt index 40453e0f..cf6b9cd7 100644 --- a/doc/catalyst-spec.5.txt +++ b/doc/catalyst-spec.5.txt @@ -200,12 +200,6 @@ include a small memory testing application, called mem= test86+ Kernel and boot issues ~~~~~~~~~~~~~~~~~~~~~~ =20 -*/splash_theme*:: -This is where you set the splash theme (example: `livecd-2006.1`). -This theme must be present in `/etc/splash`, before the kernel has -completed building. This setting is supported by the `stage4` and -`livecd` targets. - *boot/kernel*:: This option is used to specify the number of kernels to build and also the labels that will be used by the CD bootloader to refer to each diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_= template.spec index e9758909..a296cfa1 100644 --- a/examples/livecd-stage2_template.spec +++ b/examples/livecd-stage2_template.spec @@ -118,12 +118,6 @@ livecd/iso: # livecd/fsscript: livecd/fsscript: =20 -# This is where you set the splash theme. This theme must be present in -# /etc/splash, before the kernel has completed building. -# example: -# livecd/splash_theme: livecd-2006.1 -livecd/splash_theme: - # This is a set of arguments that get passed to the bootloader for your CD= . It # is used on the x86/amd64 release media to enable keymap selection. # example: @@ -334,11 +328,11 @@ livecd/unmerge: # rid of files that don't belong to a particular package, or removing file= s from # a package that you wish to keep, but won't need the full functionality. # example: -# livecd/empty: /var/tmp /var/cache /var/db /var/empty /var/lock /var/log = /var/run /var/spool /var/state /tmp /var/db/repos/gentoo /usr/share/man /us= r/share/info /usr/share/unimaps /usr/include /usr/share/zoneinfo /usr/share= /dict /usr/share/doc /usr/share/ss /usr/share/state /usr/share/texinfo /usr= /lib/python2.2 /usr/lib/portage /usr/share/gettext /usr/share/i18n /usr/sha= re/rfc /usr/lib/X11/config /usr/lib/X11/etc /usr/lib/X11/doc /usr/src /usr/= share/doc /usr/share/man /etc/cron.daily /etc/cron.hourly /etc/cron.monthly= /etc/cron.weekly /etc/logrotate.d /etc/rsync /usr/lib/awk /usr/lib/ccache = /usr/lib/gcc-config /usr/lib/nfs /usr/local /usr/diet/include /usr/diet/man= /usr/share/consolefonts/partialfonts /usr/share/consoletrans /usr/share/em= acs /usr/share/gcc-data /usr/share/genkernel /etc/bootsplash/gentoo /etc/bo= otsplash/gentoo-highquality /etc/splash/gentoo /etc/splash/emergence /usr/s= hare/gnuconfig /usr/share/lcms /usr/share/locale /etc/skel +# livecd/empty: /var/tmp /var/cache /var/db /var/empty /var/lock /var/log = /var/run /var/spool /var/state /tmp /var/db/repos/gentoo /usr/share/man /us= r/share/info /usr/share/unimaps /usr/include /usr/share/zoneinfo /usr/share= /dict /usr/share/doc /usr/share/ss /usr/share/state /usr/share/texinfo /usr= /lib/python2.2 /usr/lib/portage /usr/share/gettext /usr/share/i18n /usr/sha= re/rfc /usr/lib/X11/config /usr/lib/X11/etc /usr/lib/X11/doc /usr/src /usr/= share/doc /usr/share/man /etc/cron.daily /etc/cron.hourly /etc/cron.monthly= /etc/cron.weekly /etc/logrotate.d /etc/rsync /usr/lib/awk /usr/lib/ccache = /usr/lib/gcc-config /usr/lib/nfs /usr/local /usr/diet/include /usr/diet/man= /usr/share/consolefonts/partialfonts /usr/share/consoletrans /usr/share/em= acs /usr/share/gcc-data /usr/share/genkernel /usr/share/gnuconfig /usr/shar= e/lcms /usr/share/locale /etc/skel livecd/empty: =20 # This option tells catalyst to clean specific files from the filesystem a= nd is # very useful in cleaning up stray files in /etc left over after livecd/un= merge. # example: -# livecd/rm: /lib/*.a /usr/lib/*.a /usr/lib/gcc-lib/*/*/libgcj* /etc/dispa= tch-conf.conf /etc/etc-update.conf /etc/*- /etc/issue* /etc/portage/make.co= nf /etc/man.conf /etc/*.old /root/.viminfo /usr/sbin/bootsplash* /usr/sbin/= fb* /usr/sbin/fsck.cramfs /usr/sbin/fsck.minix /usr/sbin/mkfs.minix /usr/sb= in/mkfs.bfs /usr/sbin/mkfs.cramfs /lib/security/pam_access.so /lib/security= /pam_chroot.so /lib/security/pam_debug.so /lib/security/pam_ftp.so /lib/sec= urity/pam_issue.so /lib/security/pam_mail.so /lib/security/pam_motd.so /lib= /security/pam_mkhomedir.so /lib/security/pam_postgresok.so /lib/security/pa= m_rhosts_auth.so /lib/security/pam_userdb.so /usr/share/consolefonts/1* /us= r/share/consolefonts/7* /usr/share/consolefonts/8* /usr/share/consolefonts/= 9* /usr/share/consolefonts/A* /usr/share/consolefonts/C* /usr/share/console= fonts/E* /usr/share/consolefonts/G* /usr/share/consolefonts/L* /usr/share/c= onsolefonts/M* /usr/share/consolefonts/R* /usr/share/consolefonts/a* /usr/s= hare/consolefonts/c* /usr/share/consolefonts/dr* /usr/share/consolefonts/g*= /usr/share/consolefonts/i* /usr/share/consolefonts/k* /usr/share/consolefo= nts/l* /usr/share/consolefonts/r* /usr/share/consolefonts/s* /usr/share/con= solefonts/t* /usr/share/consolefonts/v* /etc/splash/livecd-2006.1/16* /etc/= splash/livecd-2006.1/12* /etc/splash/livecd-2006.1/6* /etc/splash/livecd-20= 06.1/8* /etc/splash/livecd-2006.1/images/silent-16* /etc/splash/livecd-2006= .1/images/silent-12* /etc/splash/livecd-2006.1/images/silent-6* /etc/splash= /livecd-2006.1/images/silent-8* /etc/splash/livecd-2006.1/images/verbose-16= * /etc/splash/livecd-2006.1/images/verbose-12* /etc/splash/livecd-2006.1/im= ages/verbose-6* /etc/splash/livecd-2006.1/images/verbose-8* /etc/portage/ma= ke.conf.example /etc/make.globals /etc/resolv.conf +# livecd/rm: /lib/*.a /usr/lib/*.a /usr/lib/gcc-lib/*/*/libgcj* /etc/dispa= tch-conf.conf /etc/etc-update.conf /etc/*- /etc/issue* /etc/portage/make.co= nf /etc/man.conf /etc/*.old /root/.viminfo /usr/sbin/fb* /usr/sbin/fsck.cra= mfs /usr/sbin/fsck.minix /usr/sbin/mkfs.minix /usr/sbin/mkfs.bfs /usr/sbin/= mkfs.cramfs /lib/security/pam_access.so /lib/security/pam_chroot.so /lib/se= curity/pam_debug.so /lib/security/pam_ftp.so /lib/security/pam_issue.so /li= b/security/pam_mail.so /lib/security/pam_motd.so /lib/security/pam_mkhomedi= r.so /lib/security/pam_postgresok.so /lib/security/pam_rhosts_auth.so /lib/= security/pam_userdb.so /usr/share/consolefonts/1* /usr/share/consolefonts/7= * /usr/share/consolefonts/8* /usr/share/consolefonts/9* /usr/share/consolef= onts/A* /usr/share/consolefonts/C* /usr/share/consolefonts/E* /usr/share/co= nsolefonts/G* /usr/share/consolefonts/L* /usr/share/consolefonts/M* /usr/sh= are/consolefonts/R* /usr/share/consolefonts/a* /usr/share/consolefonts/c* /= usr/share/consolefonts/dr* /usr/share/consolefonts/g* /usr/share/consolefon= ts/i* /usr/share/consolefonts/k* /usr/share/consolefonts/l* /usr/share/cons= olefonts/r* /usr/share/consolefonts/s* /usr/share/consolefonts/t* /usr/shar= e/consolefonts/v* /etc/portage/make.conf.example /etc/make.globals /etc/res= olv.conf livecd/rm: diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec index 75e8669f..562bfaac 100644 --- a/examples/stage4_template.spec +++ b/examples/stage4_template.spec @@ -109,12 +109,6 @@ stage4/packages: # stage4/fsscript: stage4/fsscript: =20 -# This is where you set the splash theme. This theme must be present in -# /etc/splash, before the kernel has completed building. -# example: -# stage4/splash_theme: livecd-2006.1 -stage4/splash_theme: - # This is a set of arguments that will be passed to genkernel for all kern= els # defined in this target. It is useful for passing arguments to genkernel= that # are not otherwise available via the stage4-stage2 spec file. @@ -252,11 +246,11 @@ stage4/unmerge: # rid of files that don't belong to a particular package, or removing file= s from # a package that you wish to keep, but won't need the full functionality. # example: -# stage4/empty: /var/tmp /var/cache /var/db /var/empty /var/lock /var/log = /var/run /var/spool /var/state /tmp /var/db/repos/gentoo /usr/share/man /us= r/share/info /usr/share/unimaps /usr/include /usr/share/zoneinfo /usr/share= /dict /usr/share/doc /usr/share/ss /usr/share/state /usr/share/texinfo /usr= /lib/python2.2 /usr/lib/portage /usr/share/gettext /usr/share/i18n /usr/sha= re/rfc /usr/lib/X11/config /usr/lib/X11/etc /usr/lib/X11/doc /usr/src /usr/= share/doc /usr/share/man /etc/cron.daily /etc/cron.hourly /etc/cron.monthly= /etc/cron.weekly /etc/logrotate.d /etc/rsync /usr/lib/awk /usr/lib/ccache = /usr/lib/gcc-config /usr/lib/nfs /usr/local /usr/diet/include /usr/diet/man= /usr/share/consolefonts/partialfonts /usr/share/consoletrans /usr/share/em= acs /usr/share/gcc-data /usr/share/genkernel /etc/splash/gentoo /etc/splash= /emergence /usr/share/gnuconfig /usr/share/lcms /usr/share/locale /etc/skel +# stage4/empty: /var/tmp /var/cache /var/db /var/empty /var/lock /var/log = /var/run /var/spool /var/state /tmp /var/db/repos/gentoo /usr/share/man /us= r/share/info /usr/share/unimaps /usr/include /usr/share/zoneinfo /usr/share= /dict /usr/share/doc /usr/share/ss /usr/share/state /usr/share/texinfo /usr= /lib/python2.2 /usr/lib/portage /usr/share/gettext /usr/share/i18n /usr/sha= re/rfc /usr/lib/X11/config /usr/lib/X11/etc /usr/lib/X11/doc /usr/src /usr/= share/doc /usr/share/man /etc/cron.daily /etc/cron.hourly /etc/cron.monthly= /etc/cron.weekly /etc/logrotate.d /etc/rsync /usr/lib/awk /usr/lib/ccache = /usr/lib/gcc-config /usr/lib/nfs /usr/local /usr/diet/include /usr/diet/man= /usr/share/consolefonts/partialfonts /usr/share/consoletrans /usr/share/em= acs /usr/share/gcc-data /usr/share/genkernel /usr/share/gnuconfig /usr/shar= e/lcms /usr/share/locale /etc/skel stage4/empty: =20 # This option tells catalyst to clean specific files from the filesystem a= nd is # very usefu in cleaning up stray files in /etc left over after stage4/unm= erge. # example: -# stage4/rm: /lib/*.a /usr/lib/*.a /usr/lib/gcc-lib/*/*/libgcj* /etc/dispa= tch-conf.conf /etc/etc-update.conf /etc/*- /etc/issue* /etc/portage/make.co= nf /etc/man.conf /etc/*.old /root/.viminfo /usr/sbin/fb* /usr/sbin/fsck.cra= mfs /usr/sbin/fsck.minix /usr/sbin/mkfs.minix /usr/sbin/mkfs.bfs /usr/sbin/= mkfs.cramfs /lib/security/pam_access.so /lib/security/pam_chroot.so /lib/se= curity/pam_debug.so /lib/security/pam_ftp.so /lib/security/pam_issue.so /li= b/security/pam_mail.so /lib/security/pam_motd.so /lib/security/pam_mkhomedi= r.so /lib/security/pam_postgresok.so /lib/security/pam_rhosts_auth.so /lib/= security/pam_userdb.so /usr/share/consolefonts/1* /usr/share/consolefonts/7= * /usr/share/consolefonts/8* /usr/share/consolefonts/9* /usr/share/consolef= onts/A* /usr/share/consolefonts/C* /usr/share/consolefonts/E* /usr/share/co= nsolefonts/G* /usr/share/consolefonts/L* /usr/share/consolefonts/M* /usr/sh= are/consolefonts/R* /usr/share/consolefonts/a* /usr/share/consolefonts/c* /= usr/share/consolefonts/dr* /usr/share/consolefonts/g* /usr/share/consolefon= ts/i* /usr/share/consolefonts/k* /usr/share/consolefonts/l* /usr/share/cons= olefonts/r* /usr/share/consolefonts/s* /usr/share/consolefonts/t* /usr/shar= e/consolefonts/v* /etc/splash/livecd-2006.1/16* /etc/splash/livecd-2006.1/1= 2* /etc/splash/livecd-2006.1/6* /etc/splash/livecd-2006.1/8* /etc/splash/li= vecd-2006.1/images/silent-16* /etc/splash/livecd-2006.1/images/silent-12* /= etc/splash/livecd-2006.1/images/silent-6* /etc/splash/livecd-2006.1/images/= silent-8* /etc/splash/livecd-2006.1/images/verbose-16* /etc/splash/livecd-2= 006.1/images/verbose-12* /etc/splash/livecd-2006.1/images/verbose-6* /etc/s= plash/livecd-2006.1/images/verbose-8* /etc/portage/make.conf.example /etc/m= ake.globals /etc/resolv.conf +# stage4/rm: /lib/*.a /usr/lib/*.a /usr/lib/gcc-lib/*/*/libgcj* /etc/dispa= tch-conf.conf /etc/etc-update.conf /etc/*- /etc/issue* /etc/portage/make.co= nf /etc/man.conf /etc/*.old /root/.viminfo /usr/sbin/fb* /usr/sbin/fsck.cra= mfs /usr/sbin/fsck.minix /usr/sbin/mkfs.minix /usr/sbin/mkfs.bfs /usr/sbin/= mkfs.cramfs /lib/security/pam_access.so /lib/security/pam_chroot.so /lib/se= curity/pam_debug.so /lib/security/pam_ftp.so /lib/security/pam_issue.so /li= b/security/pam_mail.so /lib/security/pam_motd.so /lib/security/pam_mkhomedi= r.so /lib/security/pam_postgresok.so /lib/security/pam_rhosts_auth.so /lib/= security/pam_userdb.so /usr/share/consolefonts/1* /usr/share/consolefonts/7= * /usr/share/consolefonts/8* /usr/share/consolefonts/9* /usr/share/consolef= onts/A* /usr/share/consolefonts/C* /usr/share/consolefonts/E* /usr/share/co= nsolefonts/G* /usr/share/consolefonts/L* /usr/share/consolefonts/M* /usr/sh= are/consolefonts/R* /usr/share/consolefonts/a* /usr/share/consolefonts/c* /= usr/share/consolefonts/dr* /usr/share/consolefonts/g* /usr/share/consolefon= ts/i* /usr/share/consolefonts/k* /usr/share/consolefonts/l* /usr/share/cons= olefonts/r* /usr/share/consolefonts/s* /usr/share/consolefonts/t* /usr/shar= e/consolefonts/v* /etc/portage/make.conf.example /etc/make.globals /etc/res= olv.conf stage4/rm: diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootload= er-setup.sh index e3d8037c..71da0c40 100755 --- a/targets/support/bootloader-setup.sh +++ b/targets/support/bootloader-setup.sh @@ -42,7 +42,6 @@ esac =20 =20 default_append_line=3D(root=3D/dev/ram0 init=3D/linuxrc ${cmdline_opts[@]}= ${custom_kopts} cdroot) -[ -n "${clst_splash_theme}" ] && default_append_line+=3D(splash=3Dsilent,t= heme:${clst_livecd_splash_theme} CONSOLE=3D/dev/tty1 quiet) =20 case ${clst_hostarch} in alpha) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 3629be57..1a432293 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -31,21 +31,6 @@ setup_gk_args() { GK_ARGS+=3D(--kernel-config=3D/var/tmp/${clst_kname}.config) fi =20 - if [ -n "${clst_splash_theme}" ] - then - GK_ARGS+=3D(--splash=3D${clst_splash_theme}) - # Setup case structure for livecd_type - case ${clst_livecd_type} in - gentoo-release-minimal|gentoo-release-universal) - case ${clst_hostarch} in - amd64|x86) - GK_ARGS+=3D(--splash-res=3D1024x768) - ;; - esac - ;; - esac - fi - if [ -d "/tmp/initramfs_overlay/${clst_initramfs_overlay}" ] then GK_ARGS+=3D(--initramfs-overlay=3D/tmp/initramfs_overlay/${clst_initramf= s_overlay}) diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-= update.sh index b1049671..53844d9f 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -174,23 +174,6 @@ esac =20 rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt = /etc/livecd.motd.txt =20 -# Setup splash (if called for) -if [ -n "${clst_livecd_splash_theme}" ] -then - if [ -d /etc/splash/${clst_livecd_splash_theme} ] - then - sed -i \ - -e "s:# SPLASH_THEME=3D\"gentoo\":SPLASH_THEME=3D\"${clst_livecd_splash= _theme}\":" \ - -e "/^# SPLASH_TTYS=3D/ s/^#//" \ - /etc/conf.d/splash - rm -f /etc/splash/default - ln -s /etc/splash/${clst_livecd_splash_theme} /etc/splash/default - else - echo "Error, cannot setup splash theme ${clst_livecd_splash_theme}" - exit 1 - fi -fi - # Clear out locales case ${clst_livecd_type} in gentoo-release-minimal|gentoo-release-universal) diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh index 6e739966..0ebd9a48 100755 --- a/targets/support/rc-update.sh +++ b/targets/support/rc-update.sh @@ -9,8 +9,6 @@ then rc-update --all del consolefont # We need to add this one, unconditionally rc-update add autoconfig default - [[ -e /etc/init.d/splash ]] && rc-update add splash default - [[ -e /etc/init.d/fbcondecor ]] && rc-update add fbcondecor default [[ -e /etc/init.d/sysklogd ]] && rc-update add sysklogd default [[ -e /etc/init.d/metalog ]] && rc-update add metalog default [[ -e /etc/init.d/syslog-ng ]] && rc-update add syslog-ng default --=20 2.26.2