From e6276d3b309b3710a92adb308f879eff7db44488 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Tue, 20 Jun 2023 11:44:08 -0300 Subject: [PATCH] 20643: Skips user account processing earlier to avoid any partial configs. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- services/login-sync/bin/arvados-login-sync | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/services/login-sync/bin/arvados-login-sync b/services/login-sync/bin/arvados-login-sync index 0a9648db92..9bcb5bfa9d 100755 --- a/services/login-sync/bin/arvados-login-sync +++ b/services/login-sync/bin/arvados-login-sync @@ -146,6 +146,12 @@ begin end end + homedir = pwnam[l[:username]].dir + if !File.exist?(homedir) + STDERR.puts "Cannot set up user #{username} because their home directory #{homedir} does not exist. Skipping." + next + end + existing_groups = current_user_groups[username] || [] groups = l[:groups] || [] # Adding users to the FUSE group has long been hardcoded behavior. @@ -175,11 +181,6 @@ begin end end - homedir = pwnam[l[:username]].dir - if !File.exist?(homedir) - STDERR.puts "Cannot set up user #{username} because their home directory #{homedir} does not exist. Skipping." - next - end userdotssh = File.join(homedir, ".ssh") Dir.mkdir(userdotssh) if !File.exist?(userdotssh) -- 2.30.2