diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-06-20 17:30:30 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-06-20 17:30:30 +0000 |
| commit | ba80043bba7bb9f5a55de1c3e45841f995f00ea1 (patch) | |
| tree | 6d4a9c8a6299c67f405988036a0938495fd47e52 | |
| parent | 7f7a9b7b58dbef59e2e1a09afe682983dc7806f8 (diff) | |
| download | drakx-ba80043bba7bb9f5a55de1c3e45841f995f00ea1.tar drakx-ba80043bba7bb9f5a55de1c3e45841f995f00ea1.tar.gz drakx-ba80043bba7bb9f5a55de1c3e45841f995f00ea1.tar.bz2 drakx-ba80043bba7bb9f5a55de1c3e45841f995f00ea1.tar.xz drakx-ba80043bba7bb9f5a55de1c3e45841f995f00ea1.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 10 | ||||
| -rw-r--r-- | perl-install/modules.pm | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 00ed1b99c..a92f7b272 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -838,9 +838,13 @@ You can add some more or change the existing ones."), if ($c eq "Add") { my @labels = map { $_->{label} } @{$b->{entries}}; my $prefix; - - $e = { type => 'image' }; - $prefix = "linux"; + if ($in->ask_from_list_('', _("Which type of entry do you want to add?"), [ __("Linux"), __("Other OS (SunOS...)") ]) eq "Linux") { + $e = { type => 'image' }; + $prefix = "linux"; + } else { + $e = { type => 'other' }; + $prefix = "sunos"; + } $e->{label} = $prefix; for (my $nb = 0; member($e->{label}, @labels); $nb++) { $e->{label} = "$prefix-$nb" } diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 7456cb462..cdb8483a8 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -488,9 +488,9 @@ sub read_conf($;$) { sub write_conf { my ($prefix) = @_; - my $file = "$prefix/etc/modules.conf"; - - rename "$prefix/etc/conf.modules", $file; #- make the switch to new name if needed + #- my $file = "$prefix/etc/modules.conf"; TODO RESTORE FOR AFTER 7.1 + #- rename "$prefix/etc/conf.modules", $file; #- make the switch to new name if needed + my $file = "$prefix/etc/conf.modules"; #- remove the post-install supermount stuff. We may have to add some more substInFile { $_ = '' if /^post-install supermount/ } $file; |