The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/1043
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
From 7c76d6b7b7e9e1fbb991f9b14d418b73c77952a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Tue, 7 Jun 2016 15:10:24 -0400
Subject: [PATCH] Drop lxc-devsetup as unneeded by current autodev
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
config/init/common/Makefile.am | 4 ++--
config/init/common/lxc-devsetup | 25 -------------------------
config/init/systemd/lxc.service.in | 1 -
config/init/sysvinit/lxc-containers.in | 1 -
config/init/upstart/lxc.conf.in | 3 ---
lxc.spec.in | 1 -
6 files changed, 2 insertions(+), 33 deletions(-)
delete mode 100755 config/init/common/lxc-devsetup
diff --git a/config/init/common/Makefile.am b/config/init/common/Makefile.am
index 123e800..8c0134c 100644
--- 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
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 fd26e83..9876155 100644
--- 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 3b38393..a7502a8 100644
--- 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 899fe11..437db3c 100644
--- 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 1c3e08a..bd77176 100644
--- 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
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
