diff options
| author | Peter Jones <pjones@redhat.com> | 2008-06-13 17:16:44 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@vroomfondel.internal.datastacks.com> | 2008-06-13 17:16:44 -0400 |
| commit | a6f91f55b1ed638ebb6fcf8823a8dd4b7049fc39 (patch) | |
| tree | c192fbe9dcba77b2d01a81148d21fa1f3d17c077 /scripts | |
| parent | 54a651f30cb40c4adbba610aff86d20a4bc38e52 (diff) | |
| download | plymouth-a6f91f55b1ed638ebb6fcf8823a8dd4b7049fc39.tar.gz plymouth-a6f91f55b1ed638ebb6fcf8823a8dd4b7049fc39.tar.xz plymouth-a6f91f55b1ed638ebb6fcf8823a8dd4b7049fc39.zip | |
Name the default plugin "default.so", not "graphical.so", so that it's obvious what's going on there.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/plymouth-populate-initrd.in | 10 | ||||
| -rwxr-xr-x | scripts/plymouth-set-default-plugin | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in index 453a41f..c2ba60b 100755 --- a/scripts/plymouth-populate-initrd.in +++ b/scripts/plymouth-populate-initrd.in @@ -102,20 +102,20 @@ 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/graphical.so ]; then - echo "${LIBDIR}/plymouth/graphical.so needs to be a symlink to desired plugin" > /dev/stderr +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/graphical.so) .so) +PLUGIN_NAME=$(basename $(readlink ${LIBDIR}/plymouth/default.so) .so) if [ ! -f ${LIBDIR}/plymouth/${PLUGIN_NAME}.so ]; then - echo "${LIBDIR}/plymouth/graphical.so links to ${LIBDIR}/plymouth/${PLUGIN_NAME}.so which doesn't exist" > /dev/stderr + echo "${LIBDIR}/plymouth/default.so links to ${LIBDIR}/plymouth/${PLUGIN_NAME}.so which doesn't exist" > /dev/stderr exit 1; fi install -m755 ${LIBDIR}/plymouth/${PLUGIN_NAME}.so ${INITRDDIR}${LIBDIR}/plymouth -(cd ${INITRDDIR}${LIBDIR}/plymouth; ln -sf ${PLUGIN_NAME}.so graphical.so) +(cd ${INITRDDIR}${LIBDIR}/plymouth; ln -sf ${PLUGIN_NAME}.so default.so) mkdir -p ${INITRDDIR}${DATADIR}/plymouth/${PLUGIN_NAME} install -m644 ${DATADIR}/plymouth/${PLUGIN_NAME}/* ${INITRDDIR}${DATADIR}/plymouth/${PLUGIN_NAME} install -D -m644 ${DATADIR}/plymouth/${PLUGIN_NAME}/* ${INITRDDIR}${DATADIR}/plymouth/${PLUGIN_NAME} diff --git a/scripts/plymouth-set-default-plugin b/scripts/plymouth-set-default-plugin index a4f0616..925c633 100755 --- a/scripts/plymouth-set-default-plugin +++ b/scripts/plymouth-set-default-plugin @@ -9,7 +9,7 @@ set -e [ -z "$BINDIR" ] && BINDIR="/usr/bin" if [ $# -lt 1 ]; then - basename $(readlink ${LIBDIR}/plymouth/graphical.so) .so + basename $(readlink ${LIBDIR}/plymouth/default.so) .so exit $? fi @@ -20,9 +20,9 @@ fi PLUGIN_NAME=$1 if [ $1 = '--reset' ]; then - PLUGIN_NAME=$(basename $(ls -1 -t ${LIBDIR}/plymouth/*.so 2> /dev/null | grep -v graphical.so | head -n 1) .so) + PLUGIN_NAME=$(basename $(ls -1 -t ${LIBDIR}/plymouth/*.so 2> /dev/null | grep -v default.so | head -n 1) .so) if [ $PLUGIN_NAME = .so ]; then - rm -f ${LIBDIR}/plymouth/graphical.so + rm -f ${LIBDIR}/plymouth/default.so exit 0 fi fi @@ -32,5 +32,5 @@ if [ ! -e ${LIBDIR}/plymouth/${PLUGIN_NAME}.so ]; then exit 1 fi -(cd ${LIBDIR}/plymouth; ln -sf ${PLUGIN_NAME}.so graphical.so) +(cd ${LIBDIR}/plymouth; ln -sf ${PLUGIN_NAME}.so default.so) |