From 779b0077527346ec9c5db6b0e3b87c93effb828e Mon Sep 17 00:00:00 2001 From: Mageia SVN-Git Migration Date: Tue, 8 Feb 2011 00:14:32 +0000 Subject: Synthesized commit during git-svn import combining previous Mandriva history with Mageia. This commit consitsts of the following subversion commits: ------------------------------------------------------------------------ r486 | dmorgan | 2011-02-08 00:14:32 +0000 (Tue, 08 Feb 2011) | 1 line Import cleaned drakwizard ------------------------------------------------------------------------ --- pxe_wizard/Pxe.pm | 44 ++++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 28 deletions(-) (limited to 'pxe_wizard/Pxe.pm') diff --git a/pxe_wizard/Pxe.pm b/pxe_wizard/Pxe.pm index f337abe7..2921d351 100644 --- a/pxe_wizard/Pxe.pm +++ b/pxe_wizard/Pxe.pm @@ -60,15 +60,15 @@ my $o = { name => N("PXE Wizard"), allow_user => 'root', var => { - IMG => '/var/install/9.2/images/network.img', - PXENAME => '92', - DESCR => 'install 9.2', + IMG => '/var/install/1/images/network.img', + PXENAME => '1', + DESCR => 'install 1', IMGTOREMOVE => '', IMGTOMODIFY => '', IP => '127.0.0.1', DIR => '/var/install/', - ALLRDZ => '/var/install/10/isolinux/alt0/all.rdz', - VMLINUZ => '/var/install/10/isolinux/alt0/vmlinuz', + ALLRDZ => '/var/install/1/isolinux/alt0/all.rdz', + VMLINUZ => '/var/install/1/isolinux/alt0/vmlinuz', OPTION => '', i => '', }, @@ -83,10 +83,9 @@ my $o = { my %level = ( 1 => N("Set PXE server"), - 2 => N("Add boot image (Mandriva Linux release < 9.2)"), - 3 => N("Remove boot image in PXE"), - 4 => N("Modify boot image in PXE"), - 5 => N("Add all.rdz image (Mandriva Linux release > 10.0)"), + 2 => N("Remove boot image in PXE"), + 3 => N("Modify boot image in PXE"), + 4 => N("Add all.rdz image (Mageia release)"), ); @@ -116,11 +115,10 @@ $o->{pages} = { post => sub { if (! -f "$X86/drakwizard_pxe") { return 'pxeserver' } if ($o->{var}{wiz_level} == 1) { return 'pxeserver' } - elsif ($o->{var}{wiz_level} == 2) { return 'addimg' } - elsif ($o->{var}{wiz_level} == 5) { return 'addimgrdz' } + elsif ($o->{var}{wiz_level} == 4) { return 'addimgrdz' } @list_menu or return 'needimg'; - if ($o->{var}{wiz_level} == 3) { return 'removeimg' } - elsif ($o->{var}{wiz_level} == 4) { return 'modifyimg' } + if ($o->{var}{wiz_level} == 2) { return 'removeimg' } + elsif ($o->{var}{wiz_level} == 3) { return 'modifyimg' } }, data => [ { label => N("What do you want to do:"), val => \$o->{var}{wiz_level}, list => [ keys %level ], format => sub { $level{$_[0]} } }, @@ -128,18 +126,8 @@ $o->{pages} = { no_back => 1, next => 'pxeserver', }, - addimg => { - name => N("Add a boot image") . "\n\n" . N("To boot through network, the network computer needs a boot image. Moreover we need to name this image, so each boot image is related to a name in PXE menu. User can then choose which image he wants to boot through PXE.") . "\n\n" . N("PXE description is used to explain the role of the boot image, e.g.: Mandriva Linux 10 image, Mandriva Linux cooker image..") . "\n\n" . N("Path to image: provide the full path to the network boot image") . "\n\n" . N("PXE name: the name displayed in PXE menu (please provide an ASCII word or a number, with no spaces)"), - data => [ - { label => "PXE name:", val => \$o->{var}{PXENAME} }, - { label => "PXE description:", val => \$o->{var}{DESCR} }, - { label => "Full path to boot image:", val => \$o->{var}{IMG} }, - ], - post => \&test_data, - next => 'summaryadd', - }, addimgrdz => { - name => N("Add all.rdz boot image") . "\n\n" . N("To boot through network, network computers need a boot image. Moreover we need to name this image, so each boot image is related to a name in PXE menu. So user can choose which image he wants to boot through PXE.") . "\n\n" . N("PXE description is used to explain the role of the boot image, e.g.: Mandriva Linux 10 image, Mandriva Linux cooker image..") . N("For technical reason, in case of multiple boot image, it's more simple to boot network computer through a kernel (vmlinuz), and provide one file with all drivers needed (in our case all.rdz).") . "\n\n" . N("Path to all.rdz: provide the full path to all.rdz image") . "\n\n" . N("PXE name: the name displayed in PXE menu (please provide an ASCII word or a number, with no spaces)"), + name => N("Add all.rdz boot image") . "\n\n" . N("To boot through network, network computers need a boot image. Moreover we need to name this image, so each boot image is related to a name in PXE menu. So user can choose which image he wants to boot through PXE.") . "\n\n" . N("PXE description is used to explain the role of the boot image, e.g.: Mageia 1 image, Mageia cauldron image..") . N("For technical reason, in case of multiple boot image, it's more simple to boot network computer through a kernel (vmlinuz), and provide one file with all drivers needed (in our case all.rdz).") . "\n\n" . N("Path to all.rdz: provide the full path to all.rdz image") . "\n\n" . N("PXE name: the name displayed in PXE menu (please provide an ASCII word or a number, with no spaces)"), data => [ { label => "PXE name:", val => \$o->{var}{PXENAME} }, { label => "PXE description:", val => \$o->{var}{DESCR} }, @@ -167,7 +155,7 @@ $o->{pages} = { next => 'gomodify', }, gomodify => { - name => N("Add option to the PXE boot image") . "\n\n" . N("Server IP: IP address of the server, which contains installation directory. You can create one with Mandriva Linux install server wizard.") . "\n" . N("Install directory: the full path to Mandriva Linux install server directory") . "\n" . N("Installation method: choose NFS or HTTP."), + name => N("Add option to the PXE boot image") . "\n\n" . N("Server IP: IP address of the server, which contains installation directory. You can create one with Mageia install server wizard.") . "\n" . N("Install directory: the full path to Mageia install server directory") . "\n" . N("Installation method: choose NFS or HTTP."), data => [ { label => N("Boot image to modify:"), val_ref => \$o->{var}{i} }, { label => N("Server IP:"), val => \$o->{var}{IP} }, @@ -201,11 +189,11 @@ $o->{pages} = { no_back => 1, next => 'welcome', post => sub { - $o->{var}{wiz_level} = 5 + $o->{var}{wiz_level} = 4 }, }, error_imgrdz => { - name => N("Please provide an all.rdz image, which contains all drivers. You can find one on the first CD of the Mandriva Linux distribution, in the /isolinux/alt0/ directory."), + name => N("Please provide an all.rdz image, which contains all drivers. You can find one on the first CD of the Mageia distribution, in the /isolinux/alt0/ directory."), next => 'addimgrdz', }, error_path_img => { @@ -502,7 +490,7 @@ sub default_pxe_messages { save_config($PXEMESSAGE); output($PXEMESSAGE, <