diff options
author | Antoine Ginies <aginies@mandriva.com> | 2004-11-12 14:30:53 +0000 |
---|---|---|
committer | Antoine Ginies <aginies@mandriva.com> | 2004-11-12 14:30:53 +0000 |
commit | 415376e1fe1b77eee63ee2a7111376784a3bc483 (patch) | |
tree | 8fdbf1a4b2e4bb4a23e39360c4c58a0df8812b34 | |
parent | 061b119a0f819909f7943c0f04b105ad44626be9 (diff) | |
download | drakpxelinux-415376e1fe1b77eee63ee2a7111376784a3bc483.tar drakpxelinux-415376e1fe1b77eee63ee2a7111376784a3bc483.tar.gz drakpxelinux-415376e1fe1b77eee63ee2a7111376784a3bc483.tar.bz2 drakpxelinux-415376e1fe1b77eee63ee2a7111376784a3bc483.tar.xz drakpxelinux-415376e1fe1b77eee63ee2a7111376784a3bc483.zip |
display resolution instead of vga code
-rw-r--r-- | drakpxelinux.pl | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/drakpxelinux.pl b/drakpxelinux.pl index beefba8..c7f2eaa 100644 --- a/drakpxelinux.pl +++ b/drakpxelinux.pl @@ -199,7 +199,7 @@ sub get_items() { if ($opts) { $optsall = $opts } else { $optsall = $optionsall } if ($label && $kernel && $initall) { my $information = get_information($label); -# my $vgares = $list_vga_res{$vgaall}; + my $vgares = $list_vga_res{$vgaall}; # now push data in @ push @listpxe, { label => $label, @@ -212,7 +212,8 @@ sub get_items() { server => $serverall, directory => $directoryall, ramdisk => $ramdiskall, - vga => $vgaall, +# vga => $vgaall, + vga => $vgares, display => $displayall, option => $optsall, },; @@ -282,12 +283,14 @@ EOF foreach my $a (@listpxe) { if ($a->{interface} && !$a->{display}) { + my $vga = $list_vga_code{$a->{vga}}; 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} vga=$a->{vga} $a->{option} + APPEND initrd=$a->{initrd} automatic=method:$a->{automatic},interface:$a->{interface},network:$a->{network},server:$a->{server},directory:$a->{directory} ramdisk_size=$a->{ramdisk} vga=$vga $a->{option} "); } elsif ($a->{interface} && $a->{display}) { + my $vga = $list_vga_code{$a->{vga}}; append_to_file($conf, " label $a->{label} KERNEL $a->{kernel} @@ -588,8 +591,9 @@ sub edit_box_item { my $vga = new Gtk2::OptionMenu(); $vga->set_popdown_strings(@list_vga_resolution); - if ($listpxe[$i]{vga} eq "automatic") { $listpxe[$i]{vga} = "" } - $vga->entry->set_text($list_vga_res{$listpxe[$i]{vga}}); +# if ($listpxe[$i]{vga} eq "automatic") { $listpxe[$i]{vga} = "" } +# $vga->entry->set_text($list_vga_res{$listpxe[$i]{vga}}); + $vga->entry->set_text($listpxe[$i]{vga}); set_help_tip($vga, 'vga'); my $display = Gtk2::Entry->new; @@ -686,11 +690,12 @@ sub edit_box_item { $listpxe[$i]{server} = $server->get_text; $listpxe[$i]{directory} = $directory->get_text; $listpxe[$i]{ramdisk} = $ramdisk->entry->get_text; - $listpxe[$i]{vga} = $vgacode; + $listpxe[$i]{vga} = $vga->entry->get_text; #$vgacode; $listpxe[$i]{display} = $display->get_text; $listpxe[$i]{option} = $option->get_text; # update value in cells +# my $getvgacode = $list_vga_code{$listpxe[$i]{vga}}; $model->set($iter, COLUMN_LABEL, $listpxe[$i]{label}, COLUMN_INFO, $listpxe[$i]{info}, @@ -703,6 +708,7 @@ sub edit_box_item { COLUMN_DIRECTORY, $listpxe[$i]{directory}, COLUMN_RAMDISK, $listpxe[$i]{ramdisk}, COLUMN_VGA, $listpxe[$i]{vga}, +# COLUMN_VGA, $vgacode, COLUMN_DISPLAY, $listpxe[$i]{display}, COLUMN_OPTION, $listpxe[$i]{option}, ); |