diff options
| -rw-r--r-- | perl-install/fs.pm | 2 | ||||
| -rw-r--r-- | perl-install/install2.pm | 6 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 1 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm index 46f569589..60440b7a9 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -235,7 +235,7 @@ sub write_fstab($;$$) { $options = $_->{options} || $options; isExt2($_) and ($freq, $passno) = (1, ($_->{mntpoint} eq '/') ? 1 : 2); - isNfs($_) and $dir = '', $options ||= 'ro,rsize=8192,wsize=8192'; + isNfs($_) and $dir = '', $options ||= 'ro,nosuid,rsize=8192,wsize=8192'; #- keep in mind the new line for fstab. @new{($_->{mntpoint}, "$dir$_->{device}")} = undef; diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 75941b1c2..824c28149 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -310,7 +310,7 @@ sub partitionDisks { cat_("/proc/mounts") =~ m|(\S+)\s+/tmp/rhimage nfs| && !grep { $_->{mntpoint} eq "/mnt/nfs" } @{$o->{manualFstab} || []} and - push @{$o->{manualFstab}}, { type => "nfs", mntpoint => "/mnt/nfs", device => $1, options => "noauto,ro,rsize=8192,wsize=8192" }; + push @{$o->{manualFstab}}, { type => "nfs", mntpoint => "/mnt/nfs", device => $1, options => "noauto,ro,nosuid,rsize=8192,wsize=8192" }; } sub formatPartitions { @@ -336,10 +336,12 @@ sub formatPartitions { #------------------------------------------------------------------------------ sub choosePackages { + my ($clicked) = $_[0]; + require pkgs; $o->setPackages if $_[1] == 1; $o->selectPackagesToUpgrade($o) if $o->{isUpgrade} && $_[1] == 1; - unless ($o->{isUpgrade}) { + if ($clicked || !$o->{isUpgrade}) { $o->choosePackages($o->{packages}, $o->{compss}, $o->{compssUsers}, $o->{compssUsersSorted}, $_[1] == 1); pkgs::unselect($o->{packages}, $o->{packages}{kdesu}) if $o->{packages}{kdesu} && $o->{security} > 3; diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 1c0564ba9..d48c29a39 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -251,6 +251,7 @@ sub afterInstallPackages($) { my $msec = "$o->{prefix}/etc/security/msec"; substInFile { s/^audio\n//; $_ .= "audio\n" if eof } "$msec/group.conf" if -d $msec; + substInFile { s/^xgrp\n//; $_ .= "xgrp\n" if eof } "$msec/group.conf" if -d $msec; my $p = $o->{packages}{urpmi}; if ($p && $p->{selected}) { diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 98d0111f5..804eadd5c 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -733,14 +733,14 @@ sub miscellaneousNetwork { sub miscellaneous { my ($o, $clicked) = @_; my %l = ( - 0 => _("Windows(TM)"), + #- 0 => _("Windows(TM)"), #- sorry :-) 1 => _("Poor"), 2 => _("Low"), 3 => _("Medium"), 4 => _("High"), 5 => _("Paranoid"), ); - delete @l{0,1,5} unless $::expert; + delete @l{1,5} unless $::expert; install_steps::miscellaneous($o); my $u = $o->{miscellaneous} ||= {}; |