summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-06-29 14:59:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-06-29 14:59:30 +0000
commitd7085ca57eb6bacd0fb92dbb92de2dca619c4b60 (patch)
tree0bb240e89b85448dff65f29c63708a12b021a434
parent5b34cfed4781181446266eb7e1b587c7a8632ac8 (diff)
downloaddrakx-d7085ca57eb6bacd0fb92dbb92de2dca619c4b60.tar
drakx-d7085ca57eb6bacd0fb92dbb92de2dca619c4b60.tar.gz
drakx-d7085ca57eb6bacd0fb92dbb92de2dca619c4b60.tar.bz2
drakx-d7085ca57eb6bacd0fb92dbb92de2dca619c4b60.tar.xz
drakx-d7085ca57eb6bacd0fb92dbb92de2dca619c4b60.zip
- default to theme Mandriva-Free, and only setting another one through THEME
environment variable
-rw-r--r--images/NEWS3
-rwxr-xr-ximages/make_boot_img3
2 files changed, 5 insertions, 1 deletions
diff --git a/images/NEWS b/images/NEWS
index 45e23eef7..811ac3644 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,6 @@
+- default to theme Mandriva-Free, and only setting another one through THEME
+ environment variable
+
Version 1.9 - 3 April 2007, by Pascal "Pixel" Rigaux
- include mmc_block for card readers
diff --git a/images/make_boot_img b/images/make_boot_img
index 055746371..72cb1a58e 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -663,7 +663,8 @@ sub syslinux_all_files {
@$kernels or die "syslinux_all_files: no kernel\n";
$default_vga =~ /788/ or die 'we rely on vga=788 for bootsplash';
- my $bootspash_cfg = '/etc/bootsplash/themes/Mandriva/config/bootsplash-800x600.cfg';
+ my $theme = $ENV{THEME} || 'Mandriva-Free';
+ my $bootspash_cfg = '/etc/bootsplash/themes/$theme/config/bootsplash-800x600.cfg';
-e $bootspash_cfg or die "can't find $bootspash_cfg";
each_index {