diff --git a/CHANGELOG.md b/CHANGELOG.md index f21a9d98..2604ac73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ The **patch** part changes incrementally at each release. * squid: split systemd tasks into own file * varnish: remove custom ExecReload= script for Debian 10+ * lxc: remove useless loop in apt execution +* lxc: update our default template to be compatible with Debian 10 ### Fixed * lxc-php: Don't remove the default pool diff --git a/lxc/templates/default.conf b/lxc/templates/default.conf index 94e7c1d6..f3aade42 100644 --- a/lxc/templates/default.conf +++ b/lxc/templates/default.conf @@ -7,7 +7,12 @@ lxc.id_map = g 0 100000 10000 {% endif %} # Set the default network virtualization method. +{% if ansible_distribution_major_version | version_compare('9', '<=') %} lxc.network.type = {{lxc_network_type}} +{% else %} +lxc.net.0.type = {{lxc_network_type}} +{% endif %} + {% if lxc_mount_part %} # Mount {{lxc_mount_part}} into containers. @@ -16,7 +21,11 @@ lxc.mount.entry = {{lxc_mount_part}} {{lxc_mount_part |replace('/', '')}} none b {% endif %} # Only one tty is enough. # This require that you disabled others tty ([2-6]) in systemd. +{% if ansible_distribution_major_version | version_compare('9', '<=') %} lxc.tty = 1 +{% else %} +lxc.tty.max = 1 +{% endif %} # Run 64bits containers lxc.arch = x86_64