summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2009-11-04 17:36:02 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2009-11-04 17:36:02 +0000
commit5e2b3514089a9aabde4a6724a5214f56affa2573 (patch)
tree3a73a88ae7e6e236a17b4fe797467f5749cf301d
parent2dc056345303b0c3583eb51729ece0e8032fa4a1 (diff)
downloaddrakx-5e2b3514089a9aabde4a6724a5214f56affa2573.tar
drakx-5e2b3514089a9aabde4a6724a5214f56affa2573.tar.gz
drakx-5e2b3514089a9aabde4a6724a5214f56affa2573.tar.bz2
drakx-5e2b3514089a9aabde4a6724a5214f56affa2573.tar.xz
drakx-5e2b3514089a9aabde4a6724a5214f56affa2573.zip
remove LOGO_CONSOLE support
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/bootsplash.pm8
2 files changed, 1 insertions, 8 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 0ff812b5f..a546a9d34 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
- partitioning wizard:
o only display Help button in install
+- remove CONSOLE_LOGO support
- kill draksplash
Version 12.77 - 30 October 2009
diff --git a/perl-install/bootsplash.pm b/perl-install/bootsplash.pm
index b63bdb3af..4ed2ea1bb 100644
--- a/perl-install/bootsplash.pm
+++ b/perl-install/bootsplash.pm
@@ -29,14 +29,12 @@ sub themes_read_sysconfig {
my %theme = (
name => $default_theme,
enabled => 1,
- keep_logo => 1
);
if (-r $::prefix . $sysconfig_file) {
local $_;
foreach (cat_($::prefix . $sysconfig_file)) {
/^SPLASH=no/ and $theme{enabled} = 0;
/^THEME=(.*)/ && -f theme_get_image_for_resolution($1, $res) and $theme{name} = $1;
- /^LOGO_CONSOLE=(.*)/ and $theme{keep_logo} = $1 ne "no";
}
}
\%theme;
@@ -84,10 +82,4 @@ sub remove() {
}
}
-sub set_logo_console {
- my ($keep_logo) = @_;
- my $logo_console = $keep_logo ? 'theme' : 'no';
- substInFile { s/^LOGO_CONSOLE=.*/LOGO_CONSOLE=$logo_console/ } $::prefix . $sysconfig_file;
-}
-
1;