Make plymouth-populate-initrd run "plymouth-set-default-plugin --reset" if none is set.

This commit is contained in:
Peter Jones 2008-06-17 11:47:23 -04:00 committed by Peter Jones
parent bdfa510fbe
commit 1892caa3df
2 changed files with 14 additions and 8 deletions

View file

@ -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;
PLUGIN_NAME=$(plymouth-set-default-plugin)
if [ -z "$PLUGIN_NAME" ]; then
echo "No default plymouth plugin is set" > /dev/stderr
exit 1
fi
PLUGIN_NAME=$(basename $(readlink ${LIBDIR}/plymouth/default.so) .so)
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

View file

@ -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