summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-10-03 17:56:24 +0200
committerGitHub <noreply@github.com>2023-10-03 17:56:24 +0200
commit65934b24809d184b15023955a17aafbb859f7bc1 (patch)
treec2206125cd49daf212560d939aa2290b6b7e8ba2 /src
parent3e4ea27ac21b163e00c03e21bf4bd8f9d19d99b6 (diff)
parent64d323299586da646ca847e78255ff2cd8464578 (diff)
downloadvyos-1x-65934b24809d184b15023955a17aafbb859f7bc1.tar.gz
vyos-1x-65934b24809d184b15023955a17aafbb859f7bc1.zip
Merge pull request #2331 from c-po/login-T5521
login: T5521: home directory owner changed during reboot
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/system-login.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/conf_mode/system-login.py b/src/conf_mode/system-login.py
index 87a269499..2cf50cb92 100755
--- a/src/conf_mode/system-login.py
+++ b/src/conf_mode/system-login.py
@@ -28,6 +28,7 @@ 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
@@ -281,8 +282,6 @@ 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')
@@ -306,6 +305,12 @@ 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),