Quoting Stéphane Graber (stgra...@ubuntu.com):
> - 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 <stgra...@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hal...@ubuntu.com>
> ---
> templates/lxc-ubuntu-cloud.in | 14 +++++---------
> templates/lxc-ubuntu.in | 23 ++++++++++++++---------
> 2 files changed, 19 insertions(+), 18 deletions(-)
>
> diff --git a/templates/lxc-ubuntu-cloud.in b/templates/lxc-ubuntu-cloud.in
> index 22bce1f..d60f2c7 100644
> --- a/templates/lxc-ubuntu-cloud.in
> +++ b/templates/lxc-ubuntu-cloud.in
> @@ -70,8 +70,6 @@ lxc.cgroup.devices.allow = c 1:5 rwm
> # consoles
> lxc.cgroup.devices.allow = c 5:1 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
> lxc.cgroup.devices.allow = c 1:9 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
> # rtc
> lxc.cgroup.devices.allow = c 254:0 rwm
> -#fuse
> +# fuse
> lxc.cgroup.devices.allow = c 10:229 rwm
> -#tun
> +# tun
> lxc.cgroup.devices.allow = c 10:200 rwm
> -#full
> +# full
> lxc.cgroup.devices.allow = c 1:7 rwm
> -#hpet
> +# hpet
> lxc.cgroup.devices.allow = c 10:228 rwm
> -#kvm
> +# kvm
> lxc.cgroup.devices.allow = c 10:232 rwm
> EOF
>
> @@ -148,8 +146,6 @@ if [ -f /etc/lsb-release ]; then
> esac
> fi
>
> -arch=$(uname -m)
> -
> # Code taken from debootstrap
> if [ -x /usr/bin/dpkg ] && /usr/bin/dpkg --print-architecture >/dev/null
> 2>&1; then
> arch=`/usr/bin/dpkg --print-architecture`
> diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
> index 8c6593b..8a92f95 100644
> --- a/templates/lxc-ubuntu.in
> +++ b/templates/lxc-ubuntu.in
> @@ -36,7 +36,7 @@ configure_ubuntu()
> hostname=$2
> release=$3
>
> - # configure the network using the dhcp
> + # configure the network using the dhcp
> cat <<EOF > $rootfs/etc/network/interfaces
> # This file describes the network interfaces available on your system
> # and how to activate them. For more information, see interfaces(5).
> @@ -91,6 +91,14 @@ EOF
> 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
> }
>
> @@ -350,8 +358,6 @@ lxc.cgroup.devices.allow = c 1:5 rwm
> # consoles
> lxc.cgroup.devices.allow = c 5:1 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
> lxc.cgroup.devices.allow = c 1:9 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
> # rtc
> lxc.cgroup.devices.allow = c 254:0 rwm
> -#fuse
> +# fuse
> lxc.cgroup.devices.allow = c 10:229 rwm
> -#tun
> +# tun
> lxc.cgroup.devices.allow = c 10:200 rwm
> -#full
> +# full
> lxc.cgroup.devices.allow = c 1:7 rwm
> -#hpet
> +# hpet
> lxc.cgroup.devices.allow = c 10:228 rwm
> -#kvm
> +# kvm
> lxc.cgroup.devices.allow = c 10:232 rwm
> EOF
>
> @@ -605,7 +611,6 @@ if [ -f /etc/lsb-release ]; then
> fi
>
> bindhome=
> -arch=$(uname -m)
>
> # Code taken from debootstrap
> if [ -x /usr/bin/dpkg ] && /usr/bin/dpkg --print-architecture >/dev/null
> 2>&1; then
> --
> 1.8.1.2
>
>
> ------------------------------------------------------------------------------
> Precog is a next-generation analytics platform capable of advanced
> analytics on semi-structured data. The platform includes APIs for building
> apps and a phenomenal toolset for data science. Developers can use
> our toolset for easy data analysis & visualization. Get a free account!
> http://www2.precog.com/precogplatform/slashdotnewsletter
> _______________________________________________
> Lxc-devel mailing list
> Lxc-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/lxc-devel
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
_______________________________________________
Lxc-devel mailing list
Lxc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxc-devel
