Drop lxc-devsetup as unneeded by current autodev

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

diff --git a/config/init/common/Makefile.am b/config/init/common/Makefile.am
index 123e800e6045c500986bf2811ab57c545f9ef05b..8c0134c7a54eea0b916e43d87265eb6f97239ef6 100644 (file)
--- a/config/init/common/Makefile.am
+++ b/config/init/common/Makefile.am
@@ -1,2 +1,2 @@
-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

diff --git a/config/init/common/lxc-devsetup b/config/init/common/lxc-devsetup
deleted file mode 100755 (executable)
index e765daf..0000000
--- a/config/init/common/lxc-devsetup
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/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

diff --git a/config/init/systemd/lxc.service.in b/config/init/systemd/lxc.service.in
index fd26e835c9ceac396c6f6becc91f0b97acffdfaa..987615528cb5af7849ae14bc6bec10f53dfc4535 100644 (file)
--- a/config/init/systemd/lxc.service.in
+++ b/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

diff --git a/config/init/sysvinit/lxc-containers.in b/config/init/sysvinit/lxc-containers.in
index 3b38393de6427e14016f8dc7c1c94d881d883840..a7502a829de87900d0b5c218bcb54b0a549e55fd 100644 (file)
--- a/config/init/sysvinit/lxc-containers.in
+++ b/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
 }

diff --git a/config/init/upstart/lxc.conf.in b/config/init/upstart/lxc.conf.in
index 899fe11058cf072cd2bc7041c44b9ec84c492b77..437db3ce5f1df3b46d5e264c96a3898baba93c3c 100644 (file)
--- a/config/init/upstart/lxc.conf.in
+++ b/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" ]

diff --git a/lxc.spec.in b/lxc.spec.in
index 1c3e08a32989577304ff612c18b690c2a690afb6..bd771760c60e666f323653e9a2fbe548557db5f4 100644 (file)
--- a/lxc.spec.in
+++ b/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