proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-27 15:49:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1043 from stgraber/master

Browse Source 
Drop lxc-devsetup as unneeded by current autodev
This commit is contained in:
Christian Brauner 2016-06-07 21:29:52 +02:00
commit b5cacc178e
6 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/init/common/Makefile.am
View File

@ -1,2 +1,2 @@
EXTRA_DIST = lxc-containers.in lxc-net.in lxc-devsetup EXTRA_DIST = lxc-containers.in lxc-net.in
pkglibexec_SCRIPTS = lxc-containers lxc-net lxc-devsetup pkglibexec_SCRIPTS = lxc-containers lxc-net

25
config/init/common/lxc-devsetup
View File

@ -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

1
config/init/systemd/lxc.service.in
View File

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

1
config/init/sysvinit/lxc-containers.in
View File

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

3
config/init/upstart/lxc.conf.in
View File

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

1
lxc.spec.in
View File

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