fix switch-themes to correctly set lilo message

1 files changed, 7 insertions, 9 deletions

diff --git a/scripts/switch-themes b/scripts/switch-themes
index 273044c..df2cc7e 100755
--- a/scripts/switch-themes
+++ b/scripts/switch-themes
@@ -40,21 +40,18 @@ function lilo_switch_themes () {
     if [[ ! -f $message_from_theme ]];then
 	return;
     fi
-    if [[ ! -e $bootdir/message ]];then
-	return;
-    fi
     
     #Make sure to point on lilo-graphic
     if [[ -L $bootdir/message ]];then
 	point_to=$(read_link $bootdir/message)
-	if [[ $point_to != lilo-graphic ]];then
+	if [[ $point_to != message-graphic ]];then
 	    rm -f $bootdir/message
-	    ln -s lilo-graphic $bootdir/message
+	    ln -s message-graphic $bootdir/message
 	fi
     fi
 
     if ! cmp -s $message_from_theme $message_from_current;then
-	cp -f $message_from_theme $message_from_current
+	cp -f $message_from_theme $bootdir/message-graphic
     fi
 }
 
@@ -104,11 +101,12 @@ function switch_theme () {
 	    echo "THEME=$toswitch" >> $sysconfig
 	fi
 	rm -f $tmpfile
-	if [[ -d /etc/bootsplash/themes/$toswitch ]]; then 
-	    rm -f /etc/bootsplash/themes/current
-	    ln -s /etc/bootsplash/themes/$toswitch current
+	if [[ -d /etc/bootsplash/$toswitch ]]; then 
+	    rm -f /etc/bootsplash/current
+	    ln -s /etc/bootsplash/$toswitch current
         fi
     fi
+    lilo_switch_themes $toswitch
 }
 
 function update_boot () {