From: Ray Strode <rstrode@redhat.com>
Date: Fri, 21 Nov 2008 16:49:53 +0000 (-0500)
Subject: Call --reset when giving default plugin if needed
X-Git-Tag: 0.6.0~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=711636ec6a46dd8d7a9ab44a124d59bc38111d72;p=thirdparty%2Fplymouth.git

Call --reset when giving default plugin if needed

Previously, we tried to do this but failed because
of a buggy conditional.
---

diff --git a/scripts/plymouth-set-default-plugin.in b/scripts/plymouth-set-default-plugin.in
index 427803bb..2d4728ab 100755
--- a/scripts/plymouth-set-default-plugin.in
+++ b/scripts/plymouth-set-default-plugin.in
@@ -34,11 +34,11 @@ function list_plugins ()
 function get_default_plugin ()
 {
         PLUGIN_NAME=$(basename $(readlink ${LIBDIR}/plymouth/default.so) .so)
-        if [ -z "$PLUGIN_NAME" ]; then
+        if [ "$PLUGIN_NAME" = ".so" ]; then
                 $0 --reset
                 PLUGIN_NAME=$(basename $(readlink ${LIBDIR}/plymouth/default.so) .so)
         fi
-        [ -n "$PLUGIN_NAME" ] && echo $PLUGIN_NAME || exit 1
+        [ "$PLUGIN_NAME" = ".so" ] || echo $PLUGIN_NAME && exit 1
 }
 
 DO_RESET=0