Merge pull request #1043 from stgraber/master

config/init/common/Makefile.am

-EXTRA_DIST = lxc-containers.in lxc-net.in lxc-devsetup
-pkglibexec_SCRIPTS = lxc-containers lxc-net lxc-devsetup
+EXTRA_DIST = lxc-containers.in lxc-net.in
+pkglibexec_SCRIPTS = lxc-containers lxc-net

config/init/common/lxc-devsetup

-#!/bin/sh -
-
-# lxc.devsetup - Setup host /dev for container /dev subdirectories.
-
-if [ ! -d /dev/.lxc ]
-then
-    echo "Creating /dev/.lxc"
-    mkdir /dev/.lxc
-    chmod 755 /dev/.lxc
-fi
-
-if grep -q "/dev devtmpfs " /proc/self/mounts
-then
-    echo "/dev is devtmpfs"
-else
-    echo "/dev is not devtmpfs - mounting tmpfs on .lxc"
-    mount -t tmpfs tmpfs /dev/.lxc
-fi
-
-if [ ! -d /dev/.lxc/user ]
-then
-    echo "Creating /dev/.lxc/user"
-    mkdir /dev/.lxc/user
-    chmod 1777 /dev/.lxc/user
-fi

config/init/systemd/lxc.service.in

@@ -6,7 +6,6 @@ Wants=lxc-net.service
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStartPre=@LIBEXECDIR@/lxc/lxc-devsetup
 ExecStartPre=@LIBEXECDIR@/lxc/lxc-apparmor-load
 ExecStart=@LIBEXECDIR@/lxc/lxc-containers start
 ExecStop=@LIBEXECDIR@/lxc/lxc-containers stop

config/init/sysvinit/lxc-containers.in

@@ -29,7 +29,6 @@ test ! -r /lib/lsb/init-functions ||
 
 start() {
     # Setup host /dev for autodev containers.
-    @LIBEXECDIR@/lxc/lxc-devsetup
     log_daemon_msg "Starting LXC autoboot containers: "
     @LIBEXECDIR@/lxc/lxc-containers start
 }

config/init/upstart/lxc.conf.in

@@ -45,9 +45,6 @@ pre-start script
 		fi
 	fi
 
-	# Setup host /dev for autodev containers.
-	@LIBEXECDIR@/lxc/lxc-devsetup
-
 	[ "x$LXC_AUTO" = "xtrue" ] || exit 0
 
 	if [ -n "$BOOTGROUPS" ]

lxc.spec.in

@@ -276,7 +276,6 @@ fi
 %{_libexecdir}/%{name}
 %attr(4111,root,root) %{_libexecdir}/%{name}/lxc-user-nic
 %if %{with_systemd}
-%attr(555,root,root) %{_libexecdir}/%{name}/lxc-devsetup
 %attr(555,root,root) %{_libexecdir}/%{name}/lxc-net
 %attr(555,root,root) %{_libexecdir}/%{name}/lxc-containers
 %endif