Networking/ccl
1
0
Fork 0
mirror of https://gitea.elkins.co/Networking/ccl.git synced 2025-03-09 12:41:40 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

output formatting

Browse Source
This commit is contained in:
Joel Elkins 2022-07-19 19:05:42 -05:00
parent 94c29f9d6e
commit c5917ff102
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/pkg/command/command.go
View File

@ -140,10 +140,10 @@ func (c Command) Execute(output io.Writer, fake bool) error {
if err != nil { if err != nil {
return err return err
} }
fmt.Fprintln(output, c.Type, "sh", "-c", cmd) fmt.Fprintf(output, "%s sh -c \"%s\"\n", c.Type, cmd)
if !fake { if !fake {
out, err := exec.Command("sh", "-c", cmd).CombinedOutput() out, err := exec.Command("sh", "-c", cmd).CombinedOutput()
fmt.Fprintln(output, string(out)) fmt.Fprint(output, string(out))
return err return err
} }
case CT_REF: case CT_REF:

8
internal/pkg/container/container.go
View File

@ -236,19 +236,19 @@ func (c *Container) initCommands() {
command.NewFunc("assure_netns", func() string { command.NewFunc("assure_netns", func() string {
netns_b, err := exec.Command("podman", "inspect", "-f", "{{.NetworkSettings.SandboxKey}}", c.Name).CombinedOutput() netns_b, err := exec.Command("podman", "inspect", "-f", "{{.NetworkSettings.SandboxKey}}", c.Name).CombinedOutput()
if err != nil { if err != nil {
return fmt.Sprintf("%s is not running\n", c.Name) return fmt.Sprintf("%s is not running", c.Name)
} }
netns := strings.TrimRight(string(netns_b), "\n") netns := strings.TrimRight(string(netns_b), "\n")
err = exec.Command("rm", "-f", "/var/run/netns/"+c.Name).Run() err = exec.Command("rm", "-f", "/var/run/netns/"+c.Name).Run()
if err != nil { if err != nil {
return fmt.Sprintln("Error:", err) return fmt.Sprintf("Error: %s", err)
} }
err = exec.Command("ln", "-sf", netns, "/var/run/netns/"+c.Name).Run() err = exec.Command("ln", "-sf", netns, "/var/run/netns/"+c.Name).Run()
if err != nil { if err != nil {
fmt.Fprintln(os.Stderr, "Warning: could not establish network namespace", err) fmt.Fprintln(os.Stderr, "Warning: could not establish network namespace", err)
return fmt.Sprintln("Error:", err) return fmt.Sprintf("Error: %s", err)
} }
return "" return fmt.Sprintf("Created /var/run/netns/%s", c.Name)
}), }),
} }
if len(c.Networks) > 0 && !*c.Networks[0].IPv6 { if len(c.Networks) > 0 && !*c.Networks[0].IPv6 {