kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

will exec /usr/bin/bash if no cmd is provided

Browse Source
This commit is contained in:
Christian Goll
2022-01-31 17:06:56 +01:00
parent 255d8c9252
commit 9d80a71cd8
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/app/wwctl/container/exec/main.go
View File

@@ -18,6 +18,9 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
containerName := args[0] containerName := args[0]
var allargs []string var allargs []string
if len(args) == 1 {
allargs = append(allargs, "/usr/bin/bash")
}
if !container.ValidSource(containerName) { if !container.ValidSource(containerName) {
wwlog.Printf(wwlog.ERROR, "Unknown Warewulf container: %s\n", containerName) wwlog.Printf(wwlog.ERROR, "Unknown Warewulf container: %s\n", containerName)

8
internal/app/wwctl/container/exec/root.go
View File

@@ -9,13 +9,13 @@ import (
var ( var (
baseCmd = &cobra.Command{ baseCmd = &cobra.Command{
DisableFlagsInUseLine: true, DisableFlagsInUseLine: true,
Use: "exec [OPTIONS] CONTAINER COMMAND", Use: "exec [OPTIONS] CONTAINER COMMAND",
Short: "Run a command inside of a Warewulf container", Short: "Run a command inside of a Warewulf container",
Long: "Run a COMMAND inside of a warewulf CONTAINER.\n" + Long: "Run a COMMAND inside of a warewulf CONTAINER.\n" +
"This is commonly used with an interactive shell such as /bin/bash\n" + "This is commonly used with an interactive shell such as /bin/bash\n" +
"to run a virtual environment within the container.", "to run a virtual environment within the container.",
RunE: CobraRunE, RunE: CobraRunE,
Args: cobra.MinimumNArgs(2), Args: cobra.MinimumNArgs(1),
ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
if len(args) != 0 { if len(args) != 0 {
return nil, cobra.ShellCompDirectiveNoFileComp return nil, cobra.ShellCompDirectiveNoFileComp