Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/urunc/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ func createUnikontainer(cmd *cli.Command, uruncCfg *unikontainers.UruncConfig) (
consoleSocket := cmd.String("console-socket")
conn, err := net.Dial("unix", consoleSocket)
if err != nil {
err = fmt.Errorf("failed to dial console socker: %w", err)
err = fmt.Errorf("failed to dial console socket: %w", err)
return err
}
defer conn.Close()
Expand Down
4 changes: 2 additions & 2 deletions cmd/urunc/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ var deleteCommand = &cli.Command{
Where "<container-id>" is the name for the instance of the container.
EXAMPLE:
For example, if the container id is "ubuntu01" and runc list currently shows the
For example, if the container id is "ubuntu01" and urunc list currently shows the
status of "ubuntu01" as "stopped" the following will delete resources held for
"ubuntu01" removing "ubuntu01" from the runc list of containers:
"ubuntu01" removing "ubuntu01" from the urunc list of containers:
# urunc delete ubuntu01`,
Flags: []cli.Flag{
Expand Down
2 changes: 1 addition & 1 deletion cmd/urunc/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func main() {
&cli.StringFlag{
Name: "log",
Value: "",
Usage: "set the log file to write runc logs to (default is '/dev/stderr')",
Usage: "set the log file to write urunc logs to (default is '/dev/stderr')",
},
&cli.StringFlag{
Name: "log-format",
Expand Down
2 changes: 1 addition & 1 deletion cmd/urunc/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ filesystem.
The specification file includes an args parameter. The args parameter is used
to specify command(s) that get run when the container is started. To change the
command(s) that get executed on start, edit the args parameter of the spec. See
"runc spec --help" for more explanation.`
"urunc spec --help" for more explanation.`

var runCommand = &cli.Command{
Name: "run",
Expand Down
7 changes: 5 additions & 2 deletions pkg/unikontainers/hypervisors/firecracker.go
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,11 @@ func (fc *Firecracker) BuildExecCmd(args types.ExecArgs, ukernel types.Unikernel
NetIfs: FCNet,
VSock: FCVSockDev,
}
FCConfigJSON, _ := json.Marshal(FCConfig)
if err := os.WriteFile(JSONConfigFile, FCConfigJSON, 0o644); err != nil { //nolint: gosec
FCConfigJSON, err := json.Marshal(FCConfig)
if err != nil {
return nil, fmt.Errorf("failed to marshal Firecracker config: %w", err)
}
if err = os.WriteFile(JSONConfigFile, FCConfigJSON, 0o644); err != nil { //nolint: gosec
return nil, fmt.Errorf("failed to save Firecracker json config: %w", err)
}
vmmLog.WithField("Json", string(FCConfigJSON)).Debug("Firecracker json config")
Expand Down
2 changes: 1 addition & 1 deletion pkg/unikontainers/rootfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ func pivotRootfs(newRoot string) error {
// We no longer need the old rootfs
err = os.RemoveAll("old_root")
if err != nil {
return fmt.Errorf("failed to remobe old_root: %w", err)
return fmt.Errorf("failed to remove old_root: %w", err)
}

return nil
Expand Down
Loading