proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-09 17:18:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add sys admin capabilty to lxc-netstat to mount /proc/net

Browse Source 
From: Daniel Lezcano <dlezcano@fr.ibm.com>

Add sys admin capability to lxc-netstat to mount /proc/net.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
This commit is contained in:
dlezcano 2008-11-26 17:32:16 +00:00
parent a6b2670f6c
commit 13832f48ed
2 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lxc.spec.in
View File

@ -77,7 +77,7 @@ development of containers
%build %build
# I don't understand why but I have to specify this prefix :( # I don't understand why but I have to specify this prefix :(
%configure --prefix=/ $args %configure $args %{confargs} --prefix=/
ncpus=`egrep -c "^cpu[0-9]+" /proc/stat || :` ncpus=`egrep -c "^cpu[0-9]+" /proc/stat || :`
make -j$ncpus make -j$ncpus
@ -123,10 +123,18 @@ if [ $RES != 0 ]; then
echo -e "\t* and reinstall lxc *" echo -e "\t* and reinstall lxc *"
echo -e "\t****************************************************" echo -e "\t****************************************************"
else else
setcap cap_setpcap,cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep %{_bindir}/lxc-execute && \ setcap cap_setpcap,cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep \
setcap cap_setpcap,cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep %{_bindir}/lxc-start && \ %{_bindir}/lxc-execute && \
setcap cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep %{_bindir}/lxc-restart && \ setcap cap_setpcap,cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep \
setcap cap_sys_admin=ep %{_bindir}/lxc-init %{_bindir}/lxc-start && \
setcap cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep \
%{_bindir}/lxc-restart && \
setcap cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep \
%{_bindir}/lxc-unshare && \
setcap cap_sys_admin=ep \
%{_bindir}/lxc-init &&
setcap cap_sys_admin=ep \
%{_bindir}/lxc-netstat
fi fi

31
src/lxc/Makefile.am
View File

@ -24,7 +24,6 @@ liblxc_la_SOURCES = \
version.c \ version.c \
error.h error.c \ error.h error.c \
cgroup.c cgroup.h \ cgroup.c cgroup.h \
cr_plugin_columbia.c \
lxc.h \ lxc.h \
lxc_utils.h \ lxc_utils.h \
lxc_lock.c lxc_lock.h \ lxc_lock.c lxc_lock.h \
@ -37,17 +36,20 @@ liblxc_la_SOURCES = \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
rtnl.c rtnl.h \ rtnl.c rtnl.h \
genl.c genl.h genl.c genl.h \
\
cr_plugin_columbia.c lxc_plugin.h
liblxc_la_LDFLAGS = -release @PACKAGE_VERSION@ liblxc_la_LDFLAGS = -release @PACKAGE_VERSION@
bin_SCRIPTS = \ bin_SCRIPTS = \
lxc-ps \ lxc-ps \
lxc-ls \
lxc-netstat \ lxc-netstat \
lxc-ls \
lxc-checkconfig lxc-checkconfig
bin_PROGRAMS = \ bin_PROGRAMS = \
lxc-unshare \
lxc-init \ lxc-init \
lxc-create \ lxc-create \
lxc-destroy \ lxc-destroy \
@ -65,6 +67,9 @@ bin_PROGRAMS = \
lxc-restart \ lxc-restart \
lxc-version lxc-version
lxc_unshare_SOURCES = lxc_unshare.c
lxc_unshare_LDADD = liblxc.la
lxc_init_SOURCES = lxc_init.c lxc_init_SOURCES = lxc_init.c
lxc_init_LDADD = liblxc.la lxc_init_LDADD = liblxc.la
@ -115,12 +120,20 @@ lxc_version_LDADD = liblxc.la
install-exec-local: install-exec-local:
-@export PATH=$$PATH:/sbin:/usr/sbin && \ -@export PATH=$$PATH:/sbin:/usr/sbin && \
setcap cap_setpcap,cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep $(bindir)/lxc-execute && \ setcap cap_setpcap,cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep \
setcap cap_setpcap,cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep $(bindir)/lxc-start && \ $(bindir)/lxc-execute && \
setcap cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep $(bindir)/lxc-restart && \ setcap cap_setpcap,cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep \
setcap cap_sys_admin=ep $(bindir)/lxc-init && \ $(bindir)/lxc-start && \
mkdir -p $(prefix)/var/lxc && \ setcap cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep \
chmod ugo+rw $(prefix)/var/lxc || \ $(bindir)/lxc-restart && \
setcap cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep \
$(bindir)/lxc-unshare && \
setcap cap_sys_admin=ep \
$(bindir)/lxc-init && \
setcap cap_sys_admin=ep \
$(bindir)/lxc-netstat && \
mkdir -p $(prefix)/var/lxc && \
chmod ugo+rw $(prefix)/var/lxc || \
(echo && echo && \ (echo && echo && \
echo "*****************************************************************" && \ echo "*****************************************************************" && \
echo "* *" && \ echo "* *" && \