summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-12-10 12:18:42 +0000
committerOlivier Blin <oblin@mandriva.com>2009-12-10 12:18:42 +0000
commit9bc36b984cc0542d4e865083bdd3c6f47d300723 (patch)
treec22785e38f96142de10352879bfd5ed4cd0719c5
parent459cb16bf5ff1736c692bdce051968c1ac07cd9b (diff)
downloaddrakiso-9bc36b984cc0542d4e865083bdd3c6f47d300723.tar
drakiso-9bc36b984cc0542d4e865083bdd3c6f47d300723.tar.gz
drakiso-9bc36b984cc0542d4e865083bdd3c6f47d300723.tar.bz2
drakiso-9bc36b984cc0542d4e865083bdd3c6f47d300723.tar.xz
drakiso-9bc36b984cc0542d4e865083bdd3c6f47d300723.zip
do not add vga mode on kernel command line if forced in append (for drakx-based replicator)
-rwxr-xr-xdraklive5
1 files changed, 3 insertions, 2 deletions
diff --git a/draklive b/draklive
index 05223e6..5d86cb2 100755
--- a/draklive
+++ b/draklive
@@ -51,13 +51,14 @@ sub need_media_specific_boot {
sub get_default_append {
my ($live, $opts) = @_;
+ my $append = $opts->{append} || $live->{system}{append};
join(' ',
if_(!need_media_specific_boot($live),
'root=' . $live->{media}->get_media_source_for_nash),
- if_($live->{system}{vga_mode},
+ if_($live->{system}{vga_mode} && $append =~ /\bvga=\b/,
'splash=silent',
'vga=' . $live->{system}{vga_mode}),
- ($opts->{append} ? $opts->{append} : $live->{system}{append} ? $live->{system}{append} : ()),
+ if_($append, $append),
);
}