diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | scripts/switch-themes | 22 |
2 files changed, 15 insertions, 9 deletions
@@ -1,5 +1,5 @@ NAME=bootsplash -VERSION := 3.2.6 +VERSION := 3.2.7 SUBDIRS=scripts fb fbmngplay fbtruetype splash po FILES=$(SUBDIRS) Makefile ChangeLog README diff --git a/scripts/switch-themes b/scripts/switch-themes index 678dbdd..6630107 100755 --- a/scripts/switch-themes +++ b/scripts/switch-themes @@ -57,16 +57,16 @@ function lilo_switch_themes () { function grub_switch_themes () { local theme=$1 - local message_from_theme=$bootsplashdir/themes/$theme/grub/splash.xpm.gz - local message_from_current=$bootdir/grub/splash.xpm.gz + local background_dir=/usr/share/gfxboot/themes/$theme/ + local gfxmenu=$bootdir/gfxmenu #checking - if [[ ! -f $message_from_theme ]];then + if [[ ! -f "$background_dir/back.jpg" ]];then return; fi - rm -f $message_from_current - cp -f $message_from_theme $message_from_current + cpio-filter --in-place --exclude back.jpg $gfxmenu + echo back.jpg | (cd $background_dir ; cpio -o --quiet -O $gfxmenu --append) } function check_it () { @@ -85,8 +85,14 @@ function check_it () { function update () { local theme=$1; - lilo_switch_themes $theme - grub_switch_themes $theme + # 20061208 warly + # with grub as default and gfxboot we should now only update + # the current link in /usr/share/bootsplash/themes + #lilo_switch_themes $theme + #grub_switch_themes $theme + # + rm -f $bootsplashdir/current + ln -s $theme $bootsplashdir/current } function switch_theme () { @@ -120,7 +126,7 @@ function switch_theme () { ln -s $toswitch /etc/bootsplash/themes/current fi fi - lilo_switch_themes $toswitch + #lilo_switch_themes $toswitch grub_switch_themes $toswitch } |