sandbox: resolve tty name
Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
parent
b989a4601a
commit
94ddc768c3
@ -239,7 +239,6 @@ func Init(prepare func(prefix string), setVerbose func(verbose bool)) {
|
|||||||
|
|
||||||
cmd := exec.Command(params.Path)
|
cmd := exec.Command(params.Path)
|
||||||
cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
|
cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
|
||||||
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
|
|
||||||
cmd.Args = params.Args
|
cmd.Args = params.Args
|
||||||
cmd.Env = params.Env
|
cmd.Env = params.Env
|
||||||
cmd.ExtraFiles = extraFiles
|
cmd.ExtraFiles = extraFiles
|
||||||
|
@ -156,7 +156,7 @@ func (d MountDev) apply(params *Params) error {
|
|||||||
if err := hostProc.bindMount(
|
if err := hostProc.bindMount(
|
||||||
toHost("/dev/"+name),
|
toHost("/dev/"+name),
|
||||||
targetPath,
|
targetPath,
|
||||||
syscall.MS_RDONLY,
|
0,
|
||||||
true,
|
true,
|
||||||
); err != nil {
|
); err != nil {
|
||||||
return err
|
return err
|
||||||
@ -204,10 +204,12 @@ func (d MountDev) apply(params *Params) error {
|
|||||||
if err := ensureFile(consolePath, 0444, 0755); err != nil {
|
if err := ensureFile(consolePath, 0444, 0755); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := hostProc.bindMount(
|
if name, err := os.Readlink(hostProc.stdout()); err != nil {
|
||||||
hostProc.stdout(),
|
return msg.WrapErr(err, err.Error())
|
||||||
|
} else if err = hostProc.bindMount(
|
||||||
|
toHost(name),
|
||||||
consolePath,
|
consolePath,
|
||||||
syscall.MS_RDONLY,
|
0,
|
||||||
false,
|
false,
|
||||||
); err != nil {
|
); err != nil {
|
||||||
return err
|
return err
|
||||||
|
Loading…
Reference in New Issue
Block a user