Explorar o código

Merge pull request #1896 from dotcloud/1885-missing-hostfile

Only mount hostname files if config exists
Michael Crosby %!s(int64=11) %!d(string=hai) anos
pai
achega
cdce873ea0
Modificáronse 1 ficheiros con 2 adicións e 0 borrados
  1. 2 0
      lxc_template.go

+ 2 - 0
lxc_template.go

@@ -30,9 +30,11 @@ lxc.network.ipv4 = {{.NetworkSettings.IPAddress}}/{{.NetworkSettings.IPPrefixLen
 {{$ROOTFS := .RootfsPath}}
 {{$ROOTFS := .RootfsPath}}
 lxc.rootfs = {{$ROOTFS}}
 lxc.rootfs = {{$ROOTFS}}
 
 
+{{if and .HostnamePath .HostsPath}}
 # enable domain name support
 # enable domain name support
 lxc.mount.entry = {{.HostnamePath}} {{$ROOTFS}}/etc/hostname none bind,ro 0 0
 lxc.mount.entry = {{.HostnamePath}} {{$ROOTFS}}/etc/hostname none bind,ro 0 0
 lxc.mount.entry = {{.HostsPath}} {{$ROOTFS}}/etc/hosts none bind,ro 0 0
 lxc.mount.entry = {{.HostsPath}} {{$ROOTFS}}/etc/hosts none bind,ro 0 0
+{{end}}
 
 
 # use a dedicated pts for the container (and limit the number of pseudo terminal
 # use a dedicated pts for the container (and limit the number of pseudo terminal
 # available)
 # available)