aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorFlorent Villard <warly@mandriva.com>2003-08-26 15:18:40 +0000
committerFlorent Villard <warly@mandriva.com>2003-08-26 15:18:40 +0000
commit7586c0138f72565f0918c296bc679fda7ce95539 (patch)
tree393f6632a4637ea08f8e46b4855e1394e513ff6e /scripts
parenta670db03bf445f6f148fa5af12e8e86cdd4357b5 (diff)
downloadbootsplash-7586c0138f72565f0918c296bc679fda7ce95539.tar
bootsplash-7586c0138f72565f0918c296bc679fda7ce95539.tar.gz
bootsplash-7586c0138f72565f0918c296bc679fda7ce95539.tar.bz2
bootsplash-7586c0138f72565f0918c296bc679fda7ce95539.tar.xz
bootsplash-7586c0138f72565f0918c296bc679fda7ce95539.zip
fix switch-themes to correctly set lilo message
Diffstat (limited to 'scripts')
-rw-r--r--scripts/splash.sh4
-rwxr-xr-xscripts/switch-themes16
2 files changed, 11 insertions, 9 deletions
diff --git a/scripts/splash.sh b/scripts/splash.sh
index d200b12..a6ccf2a 100644
--- a/scripts/splash.sh
+++ b/scripts/splash.sh
@@ -61,6 +61,10 @@ _silent="no"
grep -q silent /proc/cmdline && _silent="yes"
test "$runlevel" == "6" -o "$runlevel" == "0" && _shutdown="yes"
+if [ "$1" == "verbose" ]; then
+ echo 'verbose' > /proc/splash
+fi
+
if [ "$1" == "stop" -a $_shutdown == "no" ]; then
if [[ $LOGO_CONSOLE == No ]] || [[ $LOGO_CONSOLE == no ]] || [[ $LOGO_CONSOLE == NO ]]; then
if [[ -e /proc/splash ]];then
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 () {