Browse Source

fix(gensplash): shellcheck for modules.d/50gensplash

master
Harald Hoyer 3 years ago committed by Harald Hoyer
parent
commit
91f49acd1c
  1. 0
      modules.d/50gensplash/.shchkdir
  2. 1
      modules.d/50gensplash/gensplash-emergency.sh
  3. 1
      modules.d/50gensplash/gensplash-newroot.sh
  4. 1
      modules.d/50gensplash/gensplash-pretrigger.sh
  5. 7
      modules.d/50gensplash/module-setup.sh

0
modules.d/50gensplash/.shchkdir

1
modules.d/50gensplash/gensplash-emergency.sh

@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
#!/bin/sh

# shellcheck disable=SC2034
CDROOT=0
. /lib/gensplash-lib.sh
splash verbose

1
modules.d/50gensplash/gensplash-newroot.sh

@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
#!/bin/sh

# shellcheck disable=SC2034
CDROOT=0
. /lib/gensplash-lib.sh
splash set_msg 'Switching to new root'

1
modules.d/50gensplash/gensplash-pretrigger.sh

@ -4,6 +4,7 @@ if getargbool 1 rd.splash -d -n rd_NO_SPLASH; then @@ -4,6 +4,7 @@ if getargbool 1 rd.splash -d -n rd_NO_SPLASH; then
info "Starting Gentoo Splash"

[ -x /lib/udev/console_init ] && /lib/udev/console_init /dev/tty0
# shellcheck disable=SC2034
CDROOT=0
. /lib/gensplash-lib.sh
splash init

7
modules.d/50gensplash/module-setup.sh

@ -52,6 +52,7 @@ install() { @@ -52,6 +52,7 @@ install() {
_splash_res=${DRACUT_GENSPLASH_RES}
elif [[ ${hostonly} ]]; then
# Settings from config only in hostonly
# shellcheck disable=SC1090
[[ -e $dracutsysrootdir/etc/conf.d/splash ]] && source "$dracutsysrootdir"/etc/conf.d/splash
[[ ! ${_splash_theme} ]] && _splash_theme=default
[[ ${_splash_res} ]] && _opts+=" -r ${_splash_res}"
@ -62,15 +63,15 @@ install() { @@ -62,15 +63,15 @@ install() {

dinfo "Installing Gentoo Splash (using the ${_splash_theme} theme)"

pushd "${initdir}" > /dev/null
pushd "${initdir}" > /dev/null || exit
mv dev dev.old
call_splash_geninitramfs "${initdir}" ${_opts} ${_splash_theme} || {
call_splash_geninitramfs "${initdir}" "${_opts}" ${_splash_theme} || {
derror "Could not build splash"
return 1
}
rm -rf dev
mv dev.old dev
popd > /dev/null
popd > /dev/null || exit

inst_multiple chvt
inst /usr/share/splashutils/initrd.splash /lib/gensplash-lib.sh

Loading…
Cancel
Save