https-github-com-bit
diff --git a/‎Godeps/Godeps.json‎
Lines changed: 6 additions & 1 deletion b/‎Godeps/Godeps.json‎
Lines changed: 6 additions & 1 deletion
diff --git a/‎Godeps/_workspace/src/github.com/coreos/go-systemd/activation/files.go‎
Lines changed: 52 additions & 0 deletions b/‎Godeps/_workspace/src/github.com/coreos/go-systemd/activation/files.go‎
Lines changed: 52 additions & 0 deletions
diff --git a/‎Godeps/_workspace/src/github.com/coreos/go-systemd/activation/listeners.go‎
Lines changed: 62 additions & 0 deletions b/‎Godeps/_workspace/src/github.com/coreos/go-systemd/activation/listeners.go‎
Lines changed: 62 additions & 0 deletions
diff --git a/‎Godeps/_workspace/src/github.com/coreos/go-systemd/activation/packetconns.go‎
Lines changed: 37 additions & 0 deletions b/‎Godeps/_workspace/src/github.com/coreos/go-systemd/activation/packetconns.go‎
Lines changed: 37 additions & 0 deletions
diff --git a/‎start.go‎
Lines changed: 6 additions & 17 deletions b/‎start.go‎
Lines changed: 6 additions & 17 deletions
diff --git a/‎utils.go‎
Lines changed: 0 additions & 6 deletions b/‎utils.go‎
Lines changed: 0 additions & 6 deletions
@@ -6,17 +6,15 @@ import (
 	"fmt"
 	"os"
 	"runtime"
-	"strconv"
 	"syscall"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/codegangsta/cli"
+	"github.com/coreos/go-systemd/activation"
 	"github.com/opencontainers/runc/libcontainer"
 	"github.com/opencontainers/specs"
 )
 
-const SD_LISTEN_FDS_START = 3
-
 // default action is to start a container
 var startCommand = cli.Command{
 	Name:  "start",
@@ -59,17 +57,10 @@ var startCommand = cli.Command{
 			setupSdNotify(spec, notifySocket)
 		}
 
-		var (
-			listenFds = os.Getenv("LISTEN_FDS")
-			listenPid = os.Getenv("LISTEN_PID")
-		)
-		if listenFds != "" && listenPid == strconv.Itoa(os.Getpid()) {
-			setupSocketActivation(spec, listenFds)
-		}
-
 		if os.Geteuid() != 0 {
 			logrus.Fatal("runc should be run as root")
 		}
+
 		status, err := startContainer(context, spec)
 		if err != nil {
 			logrus.Fatalf("Container start failed: %v", err)
@@ -124,12 +115,10 @@ func startContainer(context *cli.Context, spec *specs.LinuxSpec) (int, error) {
 	process := newProcess(spec.Process)
 	// Support on-demand socket activation by passing file descriptors into the container init process.
 	if os.Getenv("LISTEN_FDS") != "" {
-		listenFdsInt, err := strconv.Atoi(os.Getenv("LISTEN_FDS"))
-		if err != nil {
-			return -1, err
-		}
-		for i := SD_LISTEN_FDS_START; i < (listenFdsInt + SD_LISTEN_FDS_START); i++ {
-			process.ExtraFiles = append(process.ExtraFiles, os.NewFile(uintptr(i), ""))
+		listenFds := activation.Files(false)
+		if len(listenFds) > 0 {
+			process.Env = append(process.Env, fmt.Sprintf("LISTEN_FDS=%d", len(listenFds)), "LISTEN_PID=1")
+			process.ExtraFiles = append(process.ExtraFiles, listenFds...)
 		}
 	}
 	tty, err := setupIO(process, rootuid, context.String("console"), spec.Process.Terminal, detach)
 
@@ -236,12 +236,6 @@ func setupSdNotify(spec *specs.LinuxSpec, notifySocket string) {
 	spec.Process.Env = append(spec.Process.Env, fmt.Sprintf("NOTIFY_SOCKET=%s", notifySocket))
 }
 
-// If systemd is supporting on-demand socket activation, this function will add support
-// for on-demand socket activation for the containerized service.
-func setupSocketActivation(spec *specs.LinuxSpec, listenFds string) {
-	spec.Process.Env = append(spec.Process.Env, fmt.Sprintf("LISTEN_FDS=%s", listenFds), "LISTEN_PID=1")
-}
-
 func destroy(container libcontainer.Container) {
 	if err := container.Destroy(); err != nil {
 		logrus.Error(err)