diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2016-05-18 18:28:46 +0000 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2016-05-18 18:29:07 +0000 |
| commit | b90ddebe1d1cb49c30c3a9d99119e3b0d14995fd (patch) | |
| tree | a462154b0ea87956dca914338f88544f205ba06a /share/config | |
| parent | Releasing debian version 20160501-1. (diff) | |
| download | open-infrastructure-compute-tools-b90ddebe1d1cb49c30c3a9d99119e3b0d14995fd.tar.xz open-infrastructure-compute-tools-b90ddebe1d1cb49c30c3a9d99119e3b0d14995fd.zip | |
Merging upstream version 20160515.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'share/config')
| -rw-r--r-- | share/config/container.conf.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/share/config/container.conf.in b/share/config/container.conf.in index fbf8078..dd52adb 100644 --- a/share/config/container.conf.in +++ b/share/config/container.conf.in @@ -1,15 +1,15 @@ # container-tools: @NAME@ [start] -cnt.autostart=@CNT_AUTOSTART@ +cnt.auto=@CNT_AUTO@ +cnt.network-bridge=@CNT_NETWORK_BRIDGE@ bind=@BIND@ boot=@BOOT@ capability=@CAPABILITY@ directory=@DIRECTORY@ drop-capability=@DROP_CAPABILITY@ machine=@MACHINE@ -network-veth=@NETWORK_VETH@ -network-bridge=@NETWORK_BRIDGE@ +network-veth-extra=@NETWORK_VETH_EXTRA@ link-journal=@LINK_JOURNAL@ register=@REGISTER@ |