diff options
author | Christian Breunig <christian@breunig.cc> | 2023-10-04 09:40:45 +0200 |
---|---|---|
committer | Christian Breunig <christian@breunig.cc> | 2023-10-04 09:40:45 +0200 |
commit | 53bc1627c09d7b6559aaafabfac69a7427e8e38c (patch) | |
tree | 02688a1c7c637a758a47f638cb4fa73ad333a2bc /src/conf_mode/system-login.py | |
parent | e258edd76090f370ff0c0f88382d099d814d85f1 (diff) | |
download | vyos-1x-53bc1627c09d7b6559aaafabfac69a7427e8e38c.tar.gz vyos-1x-53bc1627c09d7b6559aaafabfac69a7427e8e38c.zip |
Revert "login: T5521: home directory owner changed during reboot"
This reverts commit 64d323299586da646ca847e78255ff2cd8464578.
Diffstat (limited to 'src/conf_mode/system-login.py')
-rwxr-xr-x | src/conf_mode/system-login.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/conf_mode/system-login.py b/src/conf_mode/system-login.py index 2cf50cb92..87a269499 100755 --- a/src/conf_mode/system-login.py +++ b/src/conf_mode/system-login.py @@ -28,7 +28,6 @@ from vyos.configverify import verify_vrf from vyos.defaults import directories from vyos.template import render from vyos.template import is_ipv4 -from vyos.utils.boot import boot_configuration_complete from vyos.utils.dict import dict_search from vyos.utils.process import cmd from vyos.utils.process import call @@ -282,6 +281,8 @@ def generate(login): if os.path.isfile(tacacs_nss_config_file): os.unlink(tacacs_nss_config_file) + + # NSS must always be present on the system render(nss_config_file, 'login/nsswitch.conf.j2', login, permission=0o644, user='root', group='root') @@ -305,12 +306,6 @@ def generate(login): def apply(login): - # Script is invoked from vyos-router.service during startup. - # While configuration mounting and so on is not yet complete, - # skip any code that messes with the local user database - if not boot_configuration_complete(): - return None - if 'user' in login: for user, user_config in login['user'].items(): # make new user using vyatta shell and make home directory (-m), |