From 07357f5916ea7380a6008b6e29d50c1889311491 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 25 Oct 2016 15:13:01 +0200 Subject: Merging upstream version 20161101. Signed-off-by: Daniel Baumann --- share/doc/HOST-SETUP.txt | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'share/doc/HOST-SETUP.txt') diff --git a/share/doc/HOST-SETUP.txt b/share/doc/HOST-SETUP.txt index f3d813a..a5aca94 100644 --- a/share/doc/HOST-SETUP.txt +++ b/share/doc/HOST-SETUP.txt @@ -75,10 +75,8 @@ iface eth0 inet manual auto br0 iface br0 inet static address 10.0.0.2 - broadcast 10.0.0.255 gateway 10.0.0.1 netmask 255.255.255.0 - network 10.0.0.0 pre-up ifconfig eth0 down pre-up ifconfig eth0 up @@ -105,9 +103,7 @@ iface eth0 inet dhcp auto br0 iface br0 inet static address 10.0.0.1 - broadcast 10.0.0.255 netmask 255.255.255.0 - network 10.0.0.0 pre-up brctl addbr br0 post-down brctl delbr br0 @@ -154,16 +150,27 @@ iface bond0.100 inet manual auto br100 iface br100 inet static address 10.100.0.2 - broadcast 10.100.0.255 #gateway 10.100.0.1 netmask 255.255.255.0 - network 10.100.0.0 post-up ip route add 10.100.0.0/24 via 10.100.0.1 dev br100 - post-down ip route del 147.87.226.0/24 dev br100 + post-down ip route del 10.100.0.0/24 dev br100 bridge_ports bond0.100 bridge_fd 0 bridge_maxwait 0 bridge_stp 0 EOF + + +4. Enabling container-shell +--------------------------- + +Managing containers requires root privileges. In order to allow unprivileged +users to manage containers without granting them privileges or accounts, +the container-shell can be used together with sudo and a container user. + + sudo adduser --gecos "container-tools,,," \ + --home /var/lib/machines/container-tools \ + --shell /usr/bin/container-shell \ + --no-create-home container -- cgit v1.2.3