From a6f91f55b1ed638ebb6fcf8823a8dd4b7049fc39 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Fri, 13 Jun 2008 17:16:44 -0400
Subject: Name the default plugin "default.so", not "graphical.so", so that
 it's obvious what's going on there.

---
 scripts/plymouth-populate-initrd.in | 10 +++++-----
 scripts/plymouth-set-default-plugin |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'scripts')

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)
 
-- 
cgit