diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-09-24 12:11:56 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-09-24 12:11:56 +0000 |
| commit | c86683bc642ed3bad12f09197f800eb67359526f (patch) | |
| tree | 2df1636cf5319793e1c2aacf1a7841a61a5bfbc3 | |
| parent | 1fbad3fcf6b6149d30218c34b3aa2a1650585574 (diff) | |
| download | drakx-backup-do-not-use-c86683bc642ed3bad12f09197f800eb67359526f.tar drakx-backup-do-not-use-c86683bc642ed3bad12f09197f800eb67359526f.tar.gz drakx-backup-do-not-use-c86683bc642ed3bad12f09197f800eb67359526f.tar.bz2 drakx-backup-do-not-use-c86683bc642ed3bad12f09197f800eb67359526f.tar.xz drakx-backup-do-not-use-c86683bc642ed3bad12f09197f800eb67359526f.zip | |
- disable supermount by default
- cleanup nsswitch.conf wins removing
| -rw-r--r-- | perl-install/install_steps.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 53946ee11..ee3fa2826 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -411,8 +411,8 @@ Consoles 1,3,4,7 may also contain interesting information"; any::writeandclean_ldsoconf($o->{prefix}); #- make sure wins is disabled in /etc/nsswitch.conf - #- else if eth0 is not existing, glibc get SEGV. - substInFile { s/^\s*(hosts\s*:.*)\s*wins(\s*.*)/$1$2/ } "$o->{prefix}/etc/nsswitch.conf"; + #- else if eth0 is not existing, glibc segfaults. + substInFile { s/\s*wins// if /^\s*hosts\s*:/ } "$o->{prefix}/etc/nsswitch.conf"; #- make sure some services have been enabled (or a catastrophic restart will occur). #- these are normally base package post install scripts or important services to start. @@ -883,7 +883,7 @@ sub miscellaneousBefore { $o->{security} ||= $s{SECURITY} if exists $s{SECURITY}; $ENV{SECURE_LEVEL} = $o->{security}; - add2hash_ $o, { useSupermount => $o->{security} < 4 && arch() !~ /sparc/ && !$::corporate }; + add2hash_ $o, { useSupermount => 0 && $o->{security} < 4 && arch() !~ /sparc/ && !$::corporate }; add2hash_($o->{miscellaneous} ||= {}, { numlock => !$o->{pcmcia} }); } |