diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-10-05 08:20:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-05 08:20:41 +0200 |
| commit | 8dda05009a5ce8379e1f199328c1c2f4f8a1bfbc (patch) | |
| tree | 9e2449f9bf5a16f0e520b73c5839f8844490f29f | |
| parent | 11d1b3f233bebfdf4f4749b3be5f69d52b0f01f8 (diff) | |
| parent | 7498c30ef56b9727c037c5c79ec82507dd792d82 (diff) | |
| download | vyos-1x-8dda05009a5ce8379e1f199328c1c2f4f8a1bfbc.tar.gz vyos-1x-8dda05009a5ce8379e1f199328c1c2f4f8a1bfbc.zip | |
Merge pull request #2337 from vyos/mergify/bp/sagitta/pr-2336
login: T5521: do not call system-login.py in vyos-router init (backport #2336)
| -rwxr-xr-x | src/init/vyos-router | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/init/vyos-router b/src/init/vyos-router index 1e1fdeddc..3db06b368 100755 --- a/src/init/vyos-router +++ b/src/init/vyos-router @@ -234,6 +234,27 @@ cleanup_post_commit_hooks () { # system defaults. security_reset () { + + # restore NSS cofniguration back to sane system defaults + # will be overwritten later when configuration is loaded + cat <<EOF >/etc/nsswitch.conf +passwd: files +group: files +shadow: files +gshadow: files + +# Per T2678, commenting out myhostname +hosts: files dns #myhostname +networks: files + +protocols: db files +services: db files +ethers: db files +rpc: db files + +netgroup: nis +EOF + # restore PAM back to virgin state (no radius/tacacs services) pam-auth-update --package --remove radius rm -f /etc/pam_radius_auth.conf @@ -346,7 +367,6 @@ start () # As VyOS does not execute commands that are not present in the CLI we call # the script by hand to have a single source for the login banner and MOTD ${vyos_conf_scripts_dir}/system_console.py || log_failure_msg "could not reset serial console" - ${vyos_conf_scripts_dir}/system-login.py || log_failure_msg "could not reset system login" ${vyos_conf_scripts_dir}/system-login-banner.py || log_failure_msg "could not reset motd and issue files" ${vyos_conf_scripts_dir}/system-option.py || log_failure_msg "could not reset system option files" ${vyos_conf_scripts_dir}/system-ip.py || log_failure_msg "could not reset system IPv4 options" |