Fix rebase

grantseltzer · grantseltzer · commit a9b35696261b · 2016-08-02T15:42:34.000-04:00
Signed-off-by: Grantseltzer &lt;grantseltzer@gmail.com&gt;
diff --git a/cmd/ocitools/generate.go b/cmd/ocitools/generate.go
@@ -586,87 +586,3 @@ func addSeccomp(g *generate.Generator, context *cli.Context) error {
 
 	return nil
 }
-
-func setupLinuxNamespaces(context *cli.Context, g *generate.Generator, needsNewUser bool) {
-	for _, nsName := range generate.Namespaces {
-		if !context.IsSet(nsName) && !(needsNewUser && nsName == "user") {
-			continue
-		}
-		nsPath := context.String(nsName)
-		if nsPath == "host" {
-			g.RemoveLinuxNamespace(nsName)
-			continue
-		}
-		g.AddOrReplaceLinuxNamespace(nsName, nsPath)
-	}
-}
-
-func parseIDMapping(idms string) (uint32, uint32, uint32, error) {
-	idm := strings.Split(idms, ":")
-	if len(idm) != 3 {
-		return 0, 0, 0, fmt.Errorf("idmappings error: %s", idms)
-	}
-
-	hid, err := strconv.Atoi(idm[0])
-	if err != nil {
-		return 0, 0, 0, err
-	}
-
-	cid, err := strconv.Atoi(idm[1])
-	if err != nil {
-		return 0, 0, 0, err
-	}
-
-	size, err := strconv.Atoi(idm[2])
-	if err != nil {
-		return 0, 0, 0, err
-	}
-
-	return uint32(hid), uint32(cid), uint32(size), nil
-}
-
-func parseHook(s string) (string, []string) {
-	parts := strings.Split(s, ":")
-	args := []string{}
-	path := parts[0]
-	if len(parts) > 1 {
-		args = parts[1:]
-	}
-	return path, args
-}
-
-func parseTmpfsMount(s string) (string, []string, error) {
-	var dest string
-	var options []string
-	var err error
-
-	parts := strings.Split(s, ":")
-	if len(parts) == 2 {
-		dest = parts[0]
-		options = strings.Split(parts[1], ",")
-	} else if len(parts) == 1 {
-		dest = parts[0]
-		options = []string{"rw", "noexec", "nosuid", "nodev", "size=65536k"}
-	} else {
-		err = fmt.Errorf("invalid value for --tmpfs")
-	}
-
-	return dest, options, err
-}
-
-func parseBindMount(s string) (string, string, string, error) {
-	var source, dest string
-	options := "ro"
-
-	bparts := strings.SplitN(s, ":", 3)
-	switch len(bparts) {
-	case 2:
-		source, dest = bparts[0], bparts[1]
-	case 3:
-		source, dest, options = bparts[0], bparts[1], bparts[2]
-	default:
-		return source, dest, options, fmt.Errorf("--bind should have format src:dest:[options]")
-	}
-
-	return source, dest, options, nil
-}
