diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-08-13 07:58:56 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-08-13 07:58:56 +0000 |
| commit | 826d426d5ebe5b91815d81002f27021a3c2a966b (patch) | |
| tree | b9d846a3a702a1e061f546f5f598b22aee2847da | |
| parent | 56dcacb8089df70e725ae95bf827c14563db741e (diff) | |
| download | drakx-826d426d5ebe5b91815d81002f27021a3c2a966b.tar drakx-826d426d5ebe5b91815d81002f27021a3c2a966b.tar.gz drakx-826d426d5ebe5b91815d81002f27021a3c2a966b.tar.bz2 drakx-826d426d5ebe5b91815d81002f27021a3c2a966b.tar.xz drakx-826d426d5ebe5b91815d81002f27021a3c2a966b.zip | |
(setupBootloader__entries) allow to choose net profile in advanced mode
| -rw-r--r-- | perl-install/any.pm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 763ccf4ee..a4ebc18a6 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -284,9 +284,12 @@ sub setupBootloader__entries { require Xconfig::resolution_and_depth; my $Modify = sub { + require network::netconnect; #- to list network profiles my ($e) = @_; my $default = my $old_default = $e->{label} eq $b->{default}; my $vga = Xconfig::resolution_and_depth::from_bios($e->{vga}); + my $netprofile = bootloader::get_append($b, 'PROFILE'); + bootloader::remove_append_dict($b, 'PROFILE'); #- hide PROFILE option in 'append' text entry my @l; if ($e->{type} eq "image") { @@ -298,6 +301,7 @@ sub setupBootloader__entries { { label => N("Video mode"), val => \$vga, list => [ '', Xconfig::resolution_and_depth::bios_vga_modes() ], format => \&Xconfig::resolution_and_depth::to_string, advanced => 1 }, ), { label => N("Initrd"), val => \$e->{initrd}, list => [ map { if_(/^initrd/, "/boot/$_") } all("$::prefix/boot") ], not_edit => 0, advanced => 1 }, +{ label => N("Network profile"), val => \$netprofile, list => [ sort (uniq('', $netprofile, network::netconnect::get_profiles())) ], advanced => 1 }, ); } else { @l = ( @@ -336,6 +340,7 @@ sub setupBootloader__entries { $b->{default} = $old_default || $default ? $default && $e->{label} : $b->{default}; $e->{vga} = ref($vga) ? $vga->{bios} : $vga; + bootloader::set_append($b, 'PROFILE', $netprofile) if $netprofile; bootloader::configure_entry($e); #- hack to make sure initrd file are built. 1; }; |