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

ubuntu: Various fixes

Browse Source 
- Drop disabled entries from allowed devices list
 - Improve generated config layout a bit
 - Drop redundant uname call
 - Re-generate the SSH host keys on container creation

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Stéphane Graber 2013-04-21 20:09:24 +02:00
parent ed4616b1cf
commit a2abaa9ec6
No known key found for this signature in database
GPG Key ID: C638974D64792D67
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
templates/lxc-ubuntu-cloud.in
View File

@ -70,8 +70,6 @@ lxc.cgroup.devices.allow = c 1:5 rwm
# consoles # consoles
lxc.cgroup.devices.allow = c 5:1 rwm lxc.cgroup.devices.allow = c 5:1 rwm
lxc.cgroup.devices.allow = c 5:0 rwm lxc.cgroup.devices.allow = c 5:0 rwm
#lxc.cgroup.devices.allow = c 4:0 rwm
#lxc.cgroup.devices.allow = c 4:1 rwm
# /dev/{,u}random # /dev/{,u}random
lxc.cgroup.devices.allow = c 1:9 rwm lxc.cgroup.devices.allow = c 1:9 rwm
lxc.cgroup.devices.allow = c 1:8 rwm lxc.cgroup.devices.allow = c 1:8 rwm
@ -79,15 +77,15 @@ lxc.cgroup.devices.allow = c 136:* rwm
lxc.cgroup.devices.allow = c 5:2 rwm lxc.cgroup.devices.allow = c 5:2 rwm
# rtc # rtc
lxc.cgroup.devices.allow = c 254:0 rwm lxc.cgroup.devices.allow = c 254:0 rwm
#fuse # fuse
lxc.cgroup.devices.allow = c 10:229 rwm lxc.cgroup.devices.allow = c 10:229 rwm
#tun # tun
lxc.cgroup.devices.allow = c 10:200 rwm lxc.cgroup.devices.allow = c 10:200 rwm
#full # full
lxc.cgroup.devices.allow = c 1:7 rwm lxc.cgroup.devices.allow = c 1:7 rwm
#hpet # hpet
lxc.cgroup.devices.allow = c 10:228 rwm lxc.cgroup.devices.allow = c 10:228 rwm
#kvm # kvm
lxc.cgroup.devices.allow = c 10:232 rwm lxc.cgroup.devices.allow = c 10:232 rwm
EOF EOF
@ -148,8 +146,6 @@ if [ -f /etc/lsb-release ]; then
esac esac
fi fi
arch=$(uname -m)
# Code taken from debootstrap # Code taken from debootstrap
if [ -x /usr/bin/dpkg ] && /usr/bin/dpkg --print-architecture >/dev/null 2>&1; then if [ -x /usr/bin/dpkg ] && /usr/bin/dpkg --print-architecture >/dev/null 2>&1; then
arch=`/usr/bin/dpkg --print-architecture` arch=`/usr/bin/dpkg --print-architecture`

23
templates/lxc-ubuntu.in
View File

@ -36,7 +36,7 @@ configure_ubuntu()
hostname=$2 hostname=$2
release=$3 release=$3
# configure the network using the dhcp # configure the network using the dhcp
cat <<EOF > $rootfs/etc/network/interfaces cat <<EOF > $rootfs/etc/network/interfaces
# This file describes the network interfaces available on your system # This file describes the network interfaces available on your system
# and how to activate them. For more information, see interfaces(5). # and how to activate them. For more information, see interfaces(5).
@ -91,6 +91,14 @@ EOF
fi fi
fi fi
# generate new SSH keys
if [ -x $rootfs@LOCALSTATEDIR@/lib/dpkg/info/openssh-server.postinst ]; then
rm -f $rootfs/etc/ssh/ssh_host_*key*
mv $rootfs/etc/init/ssh.conf $rootfs/etc/init/ssh.conf.disabled
chroot $rootfs @LOCALSTATEDIR@/lib/dpkg/info/openssh-server.postinst configure
mv $rootfs/etc/init/ssh.conf.disabled $rootfs/etc/init/ssh.conf
fi
return 0 return 0
} }
@ -350,8 +358,6 @@ lxc.cgroup.devices.allow = c 1:5 rwm
# consoles # consoles
lxc.cgroup.devices.allow = c 5:1 rwm lxc.cgroup.devices.allow = c 5:1 rwm
lxc.cgroup.devices.allow = c 5:0 rwm lxc.cgroup.devices.allow = c 5:0 rwm
#lxc.cgroup.devices.allow = c 4:0 rwm
#lxc.cgroup.devices.allow = c 4:1 rwm
# /dev/{,u}random # /dev/{,u}random
lxc.cgroup.devices.allow = c 1:9 rwm lxc.cgroup.devices.allow = c 1:9 rwm
lxc.cgroup.devices.allow = c 1:8 rwm lxc.cgroup.devices.allow = c 1:8 rwm
@ -359,15 +365,15 @@ lxc.cgroup.devices.allow = c 136:* rwm
lxc.cgroup.devices.allow = c 5:2 rwm lxc.cgroup.devices.allow = c 5:2 rwm
# rtc # rtc
lxc.cgroup.devices.allow = c 254:0 rwm lxc.cgroup.devices.allow = c 254:0 rwm
#fuse # fuse
lxc.cgroup.devices.allow = c 10:229 rwm lxc.cgroup.devices.allow = c 10:229 rwm
#tun # tun
lxc.cgroup.devices.allow = c 10:200 rwm lxc.cgroup.devices.allow = c 10:200 rwm
#full # full
lxc.cgroup.devices.allow = c 1:7 rwm lxc.cgroup.devices.allow = c 1:7 rwm
#hpet # hpet
lxc.cgroup.devices.allow = c 10:228 rwm lxc.cgroup.devices.allow = c 10:228 rwm
#kvm # kvm
lxc.cgroup.devices.allow = c 10:232 rwm lxc.cgroup.devices.allow = c 10:232 rwm
EOF EOF
@ -605,7 +611,6 @@ if [ -f /etc/lsb-release ]; then
fi fi
bindhome= bindhome=
arch=$(uname -m)
# Code taken from debootstrap # Code taken from debootstrap
if [ -x /usr/bin/dpkg ] && /usr/bin/dpkg --print-architecture >/dev/null 2>&1; then if [ -x /usr/bin/dpkg ] && /usr/bin/dpkg --print-architecture >/dev/null 2>&1; then