Browse code
OSX compilation
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@dotcloud.com> (github: creack)
Guillaume J. Charmes authored on 2014/02/20 09:50:10Showing 4 changed files
- pkg/libcontainer/nsinit/exec.go
- pkg/libcontainer/nsinit/init.go
- pkg/libcontainer/nsinit/main.go
- pkg/libcontainer/nsinit/mount.go
| ... | ... |
@@ -2,17 +2,27 @@ package main |
| 2 | 2 |
|
| 3 | 3 |
import ( |
| 4 | 4 |
"encoding/json" |
| 5 |
+ "errors" |
|
| 5 | 6 |
"github.com/dotcloud/docker/pkg/libcontainer" |
| 6 | 7 |
"log" |
| 7 | 8 |
"os" |
| 8 | 9 |
) |
| 9 | 10 |
|
| 11 |
+var ( |
|
| 12 |
+ ErrUnsupported = errors.New("Unsupported method")
|
|
| 13 |
+ ErrWrongArguments = errors.New("Wrong argument count")
|
|
| 14 |
+) |
|
| 15 |
+ |
|
| 10 | 16 |
func main() {
|
| 11 | 17 |
container, err := loadContainer() |
| 12 | 18 |
if err != nil {
|
| 13 | 19 |
log.Fatal(err) |
| 14 | 20 |
} |
| 15 | 21 |
|
| 22 |
+ argc := len(os.Args) |
|
| 23 |
+ if argc < 2 {
|
|
| 24 |
+ log.Fatal(ErrWrongArguments) |
|
| 25 |
+ } |
|
| 16 | 26 |
switch os.Args[1] {
|
| 17 | 27 |
case "exec": |
| 18 | 28 |
exitCode, err := execCommand(container) |
| ... | ... |
@@ -21,6 +31,9 @@ func main() {
|
| 21 | 21 |
} |
| 22 | 22 |
os.Exit(exitCode) |
| 23 | 23 |
case "init": |
| 24 |
+ if argc != 3 {
|
|
| 25 |
+ log.Fatal(ErrWrongArguments) |
|
| 26 |
+ } |
|
| 24 | 27 |
if err := initCommand(container, os.Args[2]); err != nil {
|
| 25 | 28 |
log.Fatal(err) |
| 26 | 29 |
} |