diff options
Diffstat (limited to 'drakpxelinux.pl')
-rw-r--r-- | drakpxelinux.pl | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drakpxelinux.pl b/drakpxelinux.pl index 544e058..743c59b 100644 --- a/drakpxelinux.pl +++ b/drakpxelinux.pl @@ -106,7 +106,6 @@ my %help = ( 'wizardsrv' => N("launches a wizard to setup a PXE server"), 'editb' => N("edits the PXE entry selected with a dialog box"), 'removepxe' => N("removes the selected PXE entry"), - 'pxeserver' => N("Launch PXE server Wizard"), 'addpxe' => N("launches a wizard to add a PXE entry "), 'helponline' => N("get help from online documentation"), ); @@ -203,7 +202,7 @@ sub get_items() { # now push data in @ push @listpxe, { label => $label, - info => $information, + info => get_information($label), kernel => $kernel, initrd => $initall, automatic => $autoall, @@ -226,9 +225,11 @@ sub get_items() { # get info from help.txt sub get_information { my ($label) = @_; - my $line = cat_($PXEHELP); - my ($information) = $line =~ /\b$label\b\s: (.*)/; - $information and return $information; + foreach (cat_($PXEHELP)) { + my ($information) = /^\b$label\b\s:\s(.*)/; + print $information; + $information and return $information; + } } sub list_label_pxe() { @@ -528,7 +529,7 @@ sub edit_box_item { run_program::get_stdout("file $file") =~ /initrd/ or err_dialog(N("Error!"), N("Should be an initrd file")) and return; } my $d = dirname($file); - if ($d =~ /images/) { print "here"; $filesel = "images/" . $filesel } + if ($d =~ /images/) { $filesel = "images/" . $filesel } print "$filesel\n"; $data->set_text($filesel); $fd->hide; @@ -642,8 +643,8 @@ sub edit_box_item { 0, $label_and_widgets->(N("Label"), $label, ""), 0, $label_and_widgets->(N("Entry description"), $info, ""), 0, Gtk2::VSeparator->new, - 0, $label_and_widgets->(N("Kernel image"), $kernel, $buttonkernel), - 0, $label_and_widgets->(N("Initrd image"), $initrd, $buttoninitrd), + 0, $label_and_widgets->(N("Kernel image: %s/X86PC/linux/", $TFTPDIR), $kernel, $buttonkernel), + 0, $label_and_widgets->(N("Initrd image: %s/X86PC/linux/", $TFTPDIR), $initrd, $buttoninitrd), ), ), @@ -663,7 +664,7 @@ sub edit_box_item { 2, gtkadd_widget($size_groups{button}, ""), ), 0, $label_and_widgets->(N("Remote server name"), $server, ""), - 0, $label_and_widgets->(N("Remote installation directory"), $directory, $buttondir), + 0, $label_and_widgets->(N("Remote installation directory"), $directory, ""), ), ), ), @@ -882,7 +883,6 @@ sub wizard_pxe_server { undef $::WizardWindow; $::isWizard = 1; use wizards; - use Net::Interface; my $interface; use MDK::Wizard::Wizcommon; my $wz = new MDK::Wizard::Wizcommon; @@ -1132,7 +1132,7 @@ $W->add(gtkpack_(Gtk2::VBox->new(0,0), 0, Gtk2::Label->new(N("boot:")), 0, $labelscombo, 0, Gtk2::VSeparator->new, - 0, gtksignal_connect(set_help_tip(Gtk2::Button->new(N("Reconfigure PXE Server")), 'pxeserver'), clicked => sub { + 0, gtksignal_connect(set_help_tip(Gtk2::Button->new(N("Reconfigure PXE Server")), 'wizardsrv'), clicked => sub { eval { wizard_pxe_server($model, $treeview) }; my $err = $@; $::WizardWindow->destroy if defined $::WizardWindow; |