mirror of
https://github.com/containers/podman.git
synced 2025-12-01 02:27:13 +08:00
vendor latest c/{buildah,common,image,storage}
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
16
vendor/github.com/containers/buildah/chroot/run_common.go
generated
vendored
16
vendor/github.com/containers/buildah/chroot/run_common.go
generated
vendored
@@ -498,7 +498,7 @@ func runUsingChroot(spec *specs.Spec, bundlePath string, ctty *os.File, stdin io
|
||||
BundlePath: bundlePath,
|
||||
})
|
||||
if conferr != nil {
|
||||
fmt.Fprintf(os.Stderr, "error re-encoding configuration for %q", runUsingChrootExecCommand)
|
||||
fmt.Fprintf(os.Stderr, "error re-encoding configuration for %q\n", runUsingChrootExecCommand)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
@@ -567,7 +567,7 @@ func runUsingChroot(spec *specs.Spec, bundlePath string, ctty *os.File, stdin io
|
||||
}
|
||||
}
|
||||
}
|
||||
fmt.Fprintf(os.Stderr, "process exited with error: %v", err)
|
||||
fmt.Fprintf(os.Stderr, "process exited with error: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
@@ -695,7 +695,7 @@ func runUsingChrootExecMain() {
|
||||
}
|
||||
logrus.Debugf("setting supplemental groups")
|
||||
if err = syscall.Setgroups(gids); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "error setting supplemental groups list: %v", err)
|
||||
fmt.Fprintf(os.Stderr, "error setting supplemental groups list: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
} else {
|
||||
@@ -703,7 +703,7 @@ func runUsingChrootExecMain() {
|
||||
if strings.Trim(string(setgroups), "\n") != "deny" {
|
||||
logrus.Debugf("clearing supplemental groups")
|
||||
if err = syscall.Setgroups([]int{}); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "error clearing supplemental groups list: %v", err)
|
||||
fmt.Fprintf(os.Stderr, "error clearing supplemental groups list: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
@@ -711,7 +711,7 @@ func runUsingChrootExecMain() {
|
||||
|
||||
logrus.Debugf("setting gid")
|
||||
if err = unix.Setresgid(int(user.GID), int(user.GID), int(user.GID)); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "error setting GID: %v", err)
|
||||
fmt.Fprintf(os.Stderr, "error setting GID: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
@@ -732,7 +732,7 @@ func runUsingChrootExecMain() {
|
||||
|
||||
logrus.Debugf("setting uid")
|
||||
if err = unix.Setresuid(int(user.UID), int(user.UID), int(user.UID)); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "error setting UID: %v", err)
|
||||
fmt.Fprintf(os.Stderr, "error setting UID: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
@@ -745,7 +745,7 @@ func runUsingChrootExecMain() {
|
||||
logrus.Debugf("Running %#v (PATH = %q)", cmd, os.Getenv("PATH"))
|
||||
interrupted := make(chan os.Signal, 100)
|
||||
if err = cmd.Start(); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "process failed to start with error: %v", err)
|
||||
fmt.Fprintf(os.Stderr, "process failed to start with error: %v\n", err)
|
||||
}
|
||||
go func() {
|
||||
for range interrupted {
|
||||
@@ -772,7 +772,7 @@ func runUsingChrootExecMain() {
|
||||
}
|
||||
}
|
||||
}
|
||||
fmt.Fprintf(os.Stderr, "process exited with error: %v", err)
|
||||
fmt.Fprintf(os.Stderr, "process exited with error: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user