From 1a1be5a87c2169def7b0b0c29fc5cbac850a00a5 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 3 Oct 2013 21:00:16 +0200
Subject: [PATCH] Make sure we mark the libdevmapper /dev/mapper/control fd
 CLOEXEC

We do a hack to mark it such, because otherwise lxc-start will not
work.
---
 devmapper/deviceset_devmapper.go | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/devmapper/deviceset_devmapper.go b/devmapper/deviceset_devmapper.go
index bad3b7a017..7e151a8a0d 100644
--- a/devmapper/deviceset_devmapper.go
+++ b/devmapper/deviceset_devmapper.go
@@ -10,6 +10,7 @@ import (
 	"os/exec"
 	"path"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"syscall"
 )
@@ -564,6 +565,21 @@ func (devices *DeviceSetDM) setupBaseImage() error {
 	return nil
 }
 
+func setCloseOnExec(name string) {
+	fileInfos, _ := ioutil.ReadDir("/proc/self/fd")
+	if fileInfos != nil {
+		for _, i := range fileInfos {
+			link, _ := os.Readlink(filepath.Join("/proc/self/fd", i.Name()))
+			if link ==  name {
+				fd, err := strconv.Atoi(i.Name())
+				if err == nil {
+					syscall.CloseOnExec(fd)
+				}
+			}
+		}
+	}
+}
+
 func (devices *DeviceSetDM) initDevmapper() error {
 	info, err := devices.getInfo(devices.getPoolName())
 	if info == nil {
@@ -572,6 +588,11 @@ func (devices *DeviceSetDM) initDevmapper() error {
 	}
 	utils.Debugf("initDevmapper(). Pool exists: %v", info.Exists)
 
+	// It seems libdevmapper opens this without O_CLOEXEC, and go exec will not close files
+	// that are not Close-on-exec, and lxc-start will die if it inherits any unexpected files,
+	// so we add this badhack to make sure it closes itself
+	setCloseOnExec("/dev/mapper/control")
+
 	if info.Exists != 0 {
 		/* Pool exists, assume everything is up */
 		if err := devices.loadMetaData(); err != nil {