StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

system_setup: address the run_command fail issue

This commit is contained in:
Patrick Wu 2021-10-04 15:23:02 +08:00
parent 9fbff87fe1
commit 5c0e64e78a
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
system_setup/server/controllers/configure.py
View File

@ -70,18 +70,28 @@ class ConfigureController(SubiquityController):
variant = self.app.variant variant = self.app.variant
config = WSLConfigHandler(dryrun) config = WSLConfigHandler(dryrun)
if variant == "wsl_setup": if variant == "wsl_setup":
wsl_identity = self.model.identity.user wsl_id = self.model.identity.user
if dryrun: if dryrun:
log.debug("mimicking creating user %s", log.debug("mimicking creating user %s",
wsl_identity.username) wsl_id.username)
else: else:
run_command(["/usr/sbin/useradd", "-m", "-s", "/bin/bash", create_user_act = \
"-p", wsl_identity.password, run_command(["/usr/sbin/useradd", "-m", "-s",
wsl_identity.username]) "/bin/bash", "-p",
wsl_id.password,
wsl_id.username])
if create_user_act.returncode != 0:
raise Exception("Failed to create user %s"
% wsl_id.username)
log.debug("created user %s", wsl_id.username)
assign_grp_act = \
run_command(["/usr/sbin/usermod", "-a", run_command(["/usr/sbin/usermod", "-a",
"-c", wsl_identity.realname, "-c", wsl_id.realname,
"-G", get_userandgroups(), "-G", get_userandgroups(),
wsl_identity.username]) wsl_id.username])
if assign_grp_act.returncode != 0:
raise Exception("Failed to assign groups to user %s" %
wsl_id.username)
else: else:
config.update(self.model.wslconfadvanced.wslconfadvanced) config.update(self.model.wslconfadvanced.wslconfadvanced)