From 4bdec52a6a4cdca6918222096252129a3811f493 Mon Sep 17 00:00:00 2001
From: Antoine Ginies <aginies@mandriva.com>
Date: Wed, 14 Sep 2005 12:56:58 +0000
Subject: now write and read custom options

---
 drakpxelinux.pl | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drakpxelinux.pl b/drakpxelinux.pl
index 39e356c..47deb61 100644
--- a/drakpxelinux.pl
+++ b/drakpxelinux.pl
@@ -92,7 +92,7 @@ my %help = (
 	    'automatic' => N("installation method: choose NFS or HTTP"),
 	    'ramsize' => N("ramsize parameter on boot image"),
 	    'display' => N("export display on another computer (e.g.: 10.0.1.33:0)"),
-	    'option' => "apic nolapic acpi=off initrd=/bin/shell",
+	    'other' => "apic nolapic acpi=off initrd=/bin/shell",
 	    'server' => N("IP address of server, that contains the installation directory"),
 	    'labels' => N("lists all PXE entries, the default boot is the selected one"),
 	    'wizardsrv' => N("launches a wizard to setup a PXE server"),
@@ -164,7 +164,7 @@ use constant COLUMN_DIRECTORY => 8;
 use constant COLUMN_RAMDISK => 9;
 use constant COLUMN_VGA => 10;
 use constant COLUMN_DISPLAY => 11;
-use constant COLUMN_OPTION => 12;
+use constant COLUMN_OTHERS => 12;
 use constant COLUMN_AUTO_INSTALL => 13;
 use constant NUM_COLUMNS => 14;
 
@@ -199,7 +199,7 @@ sub update_pxelinux_conf_from_treeview {
   my $iter = $model->get_iter_first;
   splice @{$pxelinux_conf->{entries}};
   while ($iter) {
-    my ($label, $info, $kernel, $initrd, $method, $interface, $network, $server, $directory, $ramdisk, $vga, $display, $option, $auto_install) = $model->get($iter, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13);
+    my ($label, $info, $kernel, $initrd, $method, $interface, $network, $server, $directory, $ramdisk, $vga, $display, $others, $auto_install) = $model->get($iter, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13);
     my $entry = {
                  label => $label,
                  info => $info,
@@ -213,7 +213,7 @@ sub update_pxelinux_conf_from_treeview {
                  ramdisk => $ramdisk,
                  vga => $network::pxe::vga_resolution_to_bios{$vga},
                  display => $display,
-                 option => $option,
+                 others => $others,
 		 auto_install => $auto_install,
                 };
     if  ($entry->{label} eq "local") {
@@ -255,7 +255,7 @@ sub set_pxelinux_entry_at_iter {
 		 COLUMN_RAMDISK, $entry->{ramdisk},
 		 COLUMN_VGA, $network::pxe::vga_bios_to_resolution{$entry->{vga}},
 		 COLUMN_DISPLAY, $entry->{display},
-		 COLUMN_OPTION, $entry->{option},
+		 COLUMN_OTHERS, $entry->{others},
 		COLUMN_AUTO_INSTALL, $entry->{auto_install},
 	       );
 }
@@ -582,10 +582,10 @@ sub edit_box_item {
     $display->set_text($entry->{display});
     set_help_tip($display, 'display');
 
-    my $option = Gtk2::Entry->new;
-    if ($entry->{option} eq "") { $entry->{option} = "root=/dev/ram3 rw" }
-    $option->set_text($entry->{option});
-    set_help_tip($option, 'option');
+    my $others = Gtk2::Entry->new;
+    if ($entry->{others} eq "") { $entry->{others} = "root=/dev/ram3 rw" }
+    $others->set_text($entry->{others});
+    set_help_tip($others, 'others');
 
     my %size_groups = map { $_ => Gtk2::SizeGroup->new('horizontal') } qw(label widget button);
     my $label_and_widgets = sub {
@@ -632,7 +632,7 @@ sub edit_box_item {
 	     0, gtkadd(Gtk2::Frame->new(N("Mandriva Linux installer options")),
 		       gtkpack_(gtkset_border_width(Gtk2::VBox->new, 5),
 				0, $label_and_widgets->(N("Ramdisk size"), $ramdisk, ""),
-				0, $label_and_widgets->(N("Custom options"), $option, ""),
+				0, $label_and_widgets->(N("Custom options"), $others, ""),
 				0, $label_and_widgets->(N("Frame buffer resolution"), $vga, ""),
 				0, $label_and_widgets->(N("Remote IP of X server"), $display, ""),
 				0, gtkadd(Gtk2::Frame->new(N("Automatic Options")),
@@ -675,7 +675,7 @@ sub edit_box_item {
 				   $entry->{ramdisk} = $ramdisk->entry->get_text;
 				   $entry->{vga} = $network::pxe::vga_resolution_to_bios{$vga->entry->get_text};
 				   $entry->{display} = $display->get_text;
-				   $entry->{option} = $option->get_text;
+				   $entry->{others} = $others->get_text;
 				   $entry->{auto_install} = $auto_install->get_text;
 
 				   # update value in cells
-- 
cgit v1.2.1