From fa6d513bf6a4521c5bd473d2433350c5c211497e Mon Sep 17 00:00:00 2001
From: Antoine Ginies <aginies@mandriva.com>
Date: Mon, 2 Aug 2004 08:41:23 +0000
Subject: fix pb of display= in default config file

---
 drakpxelinux.pl | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'drakpxelinux.pl')

diff --git a/drakpxelinux.pl b/drakpxelinux.pl
index 8e2ac14..186dd94 100644
--- a/drakpxelinux.pl
+++ b/drakpxelinux.pl
@@ -176,7 +176,7 @@ sub write_conf_pxe {
   my $time = get_default_timeout;
   output($conf, <<EOF);
 # DO NOT EDIT auto_generated by drakpxe2.pl
-PROMPT $prompt
+PROMPT 10
 DEFAULT $default
 DISPLAY messages
 TIMEOUT 50
@@ -186,11 +186,17 @@ label local
 EOF
 
   foreach my $a (@listpxe) {
-    if ($a->{interface}) {
+    if ($a->{interface} and ! $a->{display}) {
       append_to_file($conf, "
 label $a->{label}
       KERNEL $a->{kernel}
-      APPEND initrd=$a->{initrd} automatic=method:$a->{automatic},interface:$a->{interface},network:$a->{network},server:$a->{server},directory:$a->{directory} ramdisk_size=$a->{ramdisk} root=/dev/ram3 rw vga=$a->{vga} display=$a->{display}
+      APPEND initrd=$a->{initrd} automatic=method:$a->{automatic},interface:$a->{interface},network:$a->{network},server:$a->{server},directory:$a->{directory} ramdisk_size=$a->{ramdisk} root=/dev/ram3 rw vga=$a->{vga}
+");
+    } elsif ($a->{interface} and $a->{display}) {
+      append_to_file($conf, "
+label $a->{label}
+     KERNEL $a->{kernel}
+     APPEND initrd=$a->{initrd} automatic=method:$a->{automatic},interface:$a->{interface},network:$a->{network},server:$a->{server},directory:$a->{directory} ramdisk_size=$a->{ramdisk} root=/dev/ram3 rw vga=$a->{vga} display=$a->{display}
 ");
     } else {
       append_to_file($conf, "
-- 
cgit v1.2.1