m26508134
/
docklet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #236 from zhongyehong/master 

fix a bug of user directory not exists
This commit is contained in:
zhong yehong 2017-05-15 17:31:02 +08:00 committed by GitHub
parent b0c7d91e72 90d8098849
commit 04f6c9c923
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/container.py
View File

@ -43,8 +43,9 @@ class Container(object):
rootfs = "/var/lib/lxc/%s/rootfs" % lxc_name
if not os.path.isdir("%s/global/users/%s" % (self.fspath,username)):
logger.error("user %s directory not found" % username)
return [False, "user directory not found"]
path = env.getenv('DOCKLET_LIB')
subprocess.call([path+"/userinit.sh", username])
logger.info("user %s directory not found, create it" % username)
sys_run("mkdir -p /var/lib/lxc/%s" % lxc_name)
logger.info("generate config file for %s" % lxc_name)

2
src/userinit.sh
View File

@ -13,7 +13,7 @@ USERNAME=$1
echo "[Info] [userinit.sh] initialize for user $USERNAME"
USER_DIR=$FS_PREFIX/global/users/$USERNAME
[ -d $USER_DIR ] && echo "[userinit.sh] user directory already exists, delete it" && rm -r $USER_DIR
[ -d $USER_DIR ] && echo "[userinit.sh] user directory already exists" && exit 0
mkdir -p $USER_DIR/{clusters,hosts,data,ssh}