diff options
author | Peter Jones <pjones@redhat.com> | 2008-06-17 11:47:23 -0400 |
---|---|---|
committer | Peter Jones <pjones@pjones2.localdomain> | 2008-06-17 11:47:23 -0400 |
commit | 1892caa3df3ae465feb7f895eda5ce2e2cc76408 (patch) | |
tree | 0f18cb67ab4501cb6c6fc2a4dd18caca0ed8f35b /scripts | |
parent | bdfa510fbefcaddb24dac99f0f7b811bad2298df (diff) | |
download | plymouth-1892caa3df3ae465feb7f895eda5ce2e2cc76408.tar.gz plymouth-1892caa3df3ae465feb7f895eda5ce2e2cc76408.tar.xz plymouth-1892caa3df3ae465feb7f895eda5ce2e2cc76408.zip |
Make plymouth-populate-initrd run "plymouth-set-default-plugin --reset" if none is set.
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/plymouth-populate-initrd.in | 15 | ||||
-rwxr-xr-x | scripts/plymouth-set-default-plugin | 7 |
2 files changed, 14 insertions, 8 deletions
diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in index c2ba60b..c52f39e 100755 --- a/scripts/plymouth-populate-initrd.in +++ b/scripts/plymouth-populate-initrd.in @@ -102,16 +102,17 @@ install -m755 ${LIBDIR}/plymouth/details.so ${INITRDDIR}${LIBDIR}/plymouth install -D -m644 ${PLYMOUTH_LOGO_FILE} ${INITRDDIR}${PLYMOUTH_LOGO_FILE} mkdir -p ${INITRDDIR}${DATADIR}/plymouth -if [ ! -L ${LIBDIR}/plymouth/default.so ]; then - echo "${LIBDIR}/plymouth/default.so needs to be a symlink to desired plugin" > /dev/stderr - exit 1; -fi -PLUGIN_NAME=$(basename $(readlink ${LIBDIR}/plymouth/default.so) .so) +PLUGIN_NAME=$(plymouth-set-default-plugin) + +if [ -z "$PLUGIN_NAME" ]; then + echo "No default plymouth plugin is set" > /dev/stderr + exit 1 +fi if [ ! -f ${LIBDIR}/plymouth/${PLUGIN_NAME}.so ]; then - echo "${LIBDIR}/plymouth/default.so links to ${LIBDIR}/plymouth/${PLUGIN_NAME}.so which doesn't exist" > /dev/stderr - exit 1; + echo "The default plymouth plugin (${PLUGIN_NAME}) doesn't exist" > /dev/stderr + exit 1 fi install -m755 ${LIBDIR}/plymouth/${PLUGIN_NAME}.so ${INITRDDIR}${LIBDIR}/plymouth diff --git a/scripts/plymouth-set-default-plugin b/scripts/plymouth-set-default-plugin index 925c633..84586e7 100755 --- a/scripts/plymouth-set-default-plugin +++ b/scripts/plymouth-set-default-plugin @@ -9,7 +9,12 @@ set -e [ -z "$BINDIR" ] && BINDIR="/usr/bin" if [ $# -lt 1 ]; then - basename $(readlink ${LIBDIR}/plymouth/default.so) .so + PLUGIN_NAME=$(basename $(readlink ${LIBDIR}/plymouth/default.so) .so) + if [ -z "$PLUGIN_NAME" ]; then + $0 --reset + PLUGIN_NAME=$(basename $(readlink ${LIBDIR}/plymouth/default.so) .so) + fi + [ -n "$PLUGIN_NAME" ] && echo $PLUGIN_NAME || exit 1 exit $? fi |