aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-01-05 14:15:20 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-01-05 14:15:20 +0000
commit2e3111a486a71289a03108f1dfcb32fbf5b80e8c (patch)
tree29d8954f4f0d12e86ac6b9922550808a51c94a2b
parent9dc453b0d9fb40095e7e620e47c1b39dd3abc435 (diff)
downloadbootsplash-2e3111a486a71289a03108f1dfcb32fbf5b80e8c.tar
bootsplash-2e3111a486a71289a03108f1dfcb32fbf5b80e8c.tar.gz
bootsplash-2e3111a486a71289a03108f1dfcb32fbf5b80e8c.tar.bz2
bootsplash-2e3111a486a71289a03108f1dfcb32fbf5b80e8c.tar.xz
bootsplash-2e3111a486a71289a03108f1dfcb32fbf5b80e8c.zip
make-boot-splash: don't run switch-themes DURING_INSTALL
-rw-r--r--bootsplash.spec5
-rwxr-xr-xscripts/make-boot-splash4
2 files changed, 7 insertions, 2 deletions
diff --git a/bootsplash.spec b/bootsplash.spec
index c18624b..babcf0b 100644
--- a/bootsplash.spec
+++ b/bootsplash.spec
@@ -1,6 +1,6 @@
%define name bootsplash
%define version 2.1.0
-%define release 1mdk
+%define release 2mdk
%define _bootdir /boot
Summary: The Boot Splash Images and scripts
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/*
%changelog
+* Mon Jan 5 2004 Pixel <pixel@mandrakesoft.com> 2.1.0-2mdk
+- make-boot-splash: don't run switch-themes DURING_INSTALL
+
* Tue Nov 18 2003 Warly <warly@mandrakesoft.com> 2.1.0-1mdk
- add Olivier Blin idea to rely on initrd to choose the correct resolution in detect-resolution
diff --git a/scripts/make-boot-splash b/scripts/make-boot-splash
index 9a4b4c2..ea22423 100755
--- a/scripts/make-boot-splash
+++ b/scripts/make-boot-splash
@@ -53,4 +53,6 @@ if [[ -x /sbin/splash ]]; then
/sbin/splash -s -f $config >> $initrd_file
fi
-$splash_dir/scripts/switch-themes -u
+if [ -z "$DURING_INSTALL" ]; then
+ $splash_dir/scripts/switch-themes -u
+fi