wbrawner/toolbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cmd/run: Notify the terminal about the real UID of 'toolbox enter'

Browse source 
This will let GNOME Terminal handle toolbox(1) running as root, by not
trying to preserve the current toolbox container if it's running as
root. This is similar to how terminals don't preserve the current
working directory for interactive shells running as root.

This needs a VTE that supports the UID parameter in the OSC 777 escape
sequence, as given below:
  OSC 777 ; container ; push ; NAME ; RUNTIME ; UID BEL
  OSC 777 ; container ; push ; NAME ; RUNTIME ; UID ST
  OSC 777 ; container ; pop ; NAME ; RUNTIME ; UID BEL
  OSC 777 ; container ; pop ; NAME ; RUNTIME ; UID ST

https://github.com/containers/toolbox/pull/649
This commit is contained in:
Debarshi Ray 2020-12-16 22:19:38 +01:00
parent 0af82ab339
commit 969e8c17ed
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cmd/run.go
View file

@ -308,7 +308,7 @@ func runCommand(container string,
execArgs = append(execArgs, command...) execArgs = append(execArgs, command...)
if emitEscapeSequence { if emitEscapeSequence {
fmt.Printf("\033]777;container;push;%s;toolbox\033\\", container) fmt.Printf("\033]777;container;push;%s;toolbox;%s\033\\", container, currentUser.Uid)
} }
logrus.Debugf("Running in container %s:", container) logrus.Debugf("Running in container %s:", container)
@ -320,7 +320,7 @@ func runCommand(container string,
exitCode, err := shell.RunWithExitCode("podman", os.Stdin, os.Stdout, nil, execArgs...) exitCode, err := shell.RunWithExitCode("podman", os.Stdin, os.Stdout, nil, execArgs...)
if emitEscapeSequence { if emitEscapeSequence {
fmt.Print("\033]777;container;pop;;\033\\") fmt.Printf("\033]777;container;pop;;;%s\033\\", currentUser.Uid)
} }
switch exitCode { switch exitCode {