未验证 提交 9777f5ca 编写于 作者: jia zhang's avatar jia zhang 提交者: GitHub

rune: Minor code cleanup

Signed-off-by: jia zhang's avatarJia Zhang <zhang.jia@linux.alibaba.com>
上级 5115df07
......@@ -224,7 +224,7 @@ func (v *ConfigValidator) enclave(config *configs.Config) error {
path := config.Enclave.Path
if config.Enclave.Signer != "server" {
var err error
path, err = securejoin.SecureJoin(config.Rootfs, config.Enclave.Path)
path, err = securejoin.SecureJoin(config.Rootfs, path)
if err != nil {
return err
}
......
......@@ -532,11 +532,11 @@ func (c *linuxContainer) commandTemplate(p *Process, childInitPipe *os.File, chi
}
if c.config.Enclave.Path != "" {
cmd.Env = append(cmd.Env, "_LIBCONTAINER_PAL_PATH="+string(c.config.Enclave.Path))
cmd.Env = append(cmd.Env, "_LIBCONTAINER_PAL_PATH="+c.config.Enclave.Path)
}
if c.config.Enclave.Signer != "server" {
cmd.Env = append(cmd.Env, "_LIBCONTAINER_PAL_ROOTFS="+string(c.config.Rootfs))
cmd.Env = append(cmd.Env, "_LIBCONTAINER_PAL_ROOTFS="+c.config.Rootfs)
}
if detached {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册