Name the default plugin "default.so", not "graphical.so", so that it's obvious what...

diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
index 453a41fdda36722f353b1bca5072097b91599ce5..c2ba60b64027b2290a26c3918af09cdf559a11e2 100755 (executable)
--- 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 a4f0616ee1183b494dd6b490603096bdda09cd6a..925c63356e422e4aaedb6fb7a3d04a4da9a3db90 100755 (executable)
--- 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)
 

diff --git a/src/main.c b/src/main.c
index b5ca0da5c27ac60e8f104c6e04322e68152e21a0..b586f45c054415e9e96407093ce8ae098ccf3259 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -125,7 +125,7 @@ on_show_splash (state_t *state)
 {
   ply_trace ("Showing splash screen");
   state->boot_splash = start_boot_splash (state,
-                                          PLYMOUTH_PLUGIN_PATH "graphical.so");
+                                          PLYMOUTH_PLUGIN_PATH "default.so");
 
   if (state->boot_splash == NULL)
     {

diff --git a/src/splash-plugins/Makefile.am b/src/splash-plugins/Makefile.am
index 39263d96a9c122623f3ab9351c5b9dd2b54aae7a..a36d44dd77d17a3564b8334d2131efc4d90df176 100644 (file)
--- a/src/splash-plugins/Makefile.am
+++ b/src/splash-plugins/Makefile.am
@@ -3,5 +3,5 @@ MAINTAINERCLEANFILES = Makefile.in
 
 if ADD_DEFAULT_PLUGIN_LINK
 install-data-hook:
-       (cd $(DESTDIR)$(libdir)/plymouth; ln -sf $(default_plugin_name).so graphical.so)
+       (cd $(DESTDIR)$(libdir)/plymouth; ln -sf $(default_plugin_name).so default.so)
 endif