summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2012-03-19 18:35:17 +0000
committerColin Guthrie <colin@mageia.org>2012-03-19 18:35:17 +0000
commit5227e4f767d90f841ca44734cdb386e3d0162351 (patch)
tree484f0660abcebdcd8ecae05c583da1e1b33d0a2a
parent91fe91af055548dcedc928236d6ec5e97d843834 (diff)
downloaddrakx-backup-do-not-use-5227e4f767d90f841ca44734cdb386e3d0162351.tar
drakx-backup-do-not-use-5227e4f767d90f841ca44734cdb386e3d0162351.tar.gz
drakx-backup-do-not-use-5227e4f767d90f841ca44734cdb386e3d0162351.tar.bz2
drakx-backup-do-not-use-5227e4f767d90f841ca44734cdb386e3d0162351.tar.xz
drakx-backup-do-not-use-5227e4f767d90f841ca44734cdb386e3d0162351.zip
Update drakboot splash updating code.
Note: This is no longer used, but for completeness I am making it support the splash + quiet kernel command line params.
-rwxr-xr-xperl-install/standalone/drakboot16
1 files changed, 10 insertions, 6 deletions
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index bdbfc80d6..91a9c8db5 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -127,10 +127,9 @@ sub splash_choice() {
my $boot_warn = 1;
my %modes = (
text => N("Text only"),
- verbose => N("Verbose"),
- silent => N("Silent"),
+ splash => N("Silent"),
);
- my $mode_combo = gtknew('ComboBox', text => $modes{$theme->{enabled} ? $cmdline =~ /\bsplash=silent\b/ ? 'silent' : 'verbose' : 'text'}, list => [ values %modes ]);
+ my $mode_combo = gtknew('ComboBox', text => $modes{$theme->{enabled} ? $cmdline =~ /\bsplash\b/ && $cmdline =~ /\bquiet\b/ ? 'splash' : 'text' : 'text'}, list => [ values %modes ]);
$mode_combo->entry->signal_connect(changed => sub {
$theme->{enabled} = $mode_combo->entry->get_text ne $modes{text};
if ($boot_warn && !$bootsplash_available && $theme->{enabled}) {
@@ -165,7 +164,7 @@ sub splash_choice() {
}
my $text = $mode_combo->entry->get_text;
my $mode = find { $modes{$_} eq $text } keys %modes;
- set_splash_append($mode ne 'text' ? $mode : undef);
+ set_splash_append($mode);
});
}
@@ -242,8 +241,13 @@ sub change_image {
sub set_splash_append {
my ($val) = @_;
- bootloader::set_append_with_key($bootloader, 'splash', undef);
- bootloader::set_append_with_key($bootloader, 'splash', $val);
+ if ($mode ne 'splash') {
+ bootloader::remove_append_simple($bootloader, 'splash');
+ bootloader::remove_append_simple($bootloader, 'quiet');
+ } else {
+ bootloader::set_append_simple($bootloader, 'splash');
+ bootloader::set_append_simple($bootloader, 'quiet');
+ }
modify_bootloader($bootloader, $all_hds);
}