From 9bc36b984cc0542d4e865083bdd3c6f47d300723 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Thu, 10 Dec 2009 12:18:42 +0000
Subject: do not add vga mode on kernel command line if forced in append (for
 drakx-based replicator)

---
 draklive | 5 +++--
 1 file 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),
      );
 }
 
-- 
cgit v1.2.1