summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/install_steps_interactive.pm10
-rw-r--r--perl-install/modules.pm6
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;