Merge branch 'master' into pr75

containernetworking · Apr 9, 2019 · 0ab8aaa · 0ab8aaa
2 parents dd1a949 + fbd9acc
commit 0ab8aaa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/plugins/ipam/dhcp/README.md b/plugins/ipam/dhcp/README.md
@@ -18,7 +18,7 @@ $ ./dhcp daemon
 
 If given `-pidfile <path>` arguments after 'daemon', the dhcp plugin will write
 its PID to the given file.
-If given `-hostprefix <prefix>` arguments after 'daemon', the dhcp plugin will use this prefix for netns as `<prefix>/<original netns>`. It could be used in case of running dhcp daemon as container.
+If given `-hostprefix <prefix>` arguments after 'daemon', the dhcp plugin will use this prefix for DHCP socket as `<prefix>/run/cni/dhcp.sock`. You can use this prefix for references to the host filesystem, e.g. to access netns and the unix socket.
 
 Alternatively, you can use systemd socket activation protocol.
 Be sure that the .socket file uses /run/cni/dhcp.sock as the socket path.

diff --git a/plugins/ipam/dhcp/daemon.go b/plugins/ipam/dhcp/daemon.go
@@ -166,7 +166,7 @@ func runDaemon(pidfilePath string, hostPrefix string) error {
 		}
 	}
 
-	l, err := getListener()
+	l, err := getListener(hostPrefix + socketPath)
 	if err != nil {
 		return fmt.Errorf("Error getting listener: %v", err)
 	}

diff --git a/plugins/ipam/dhcp/main.go b/plugins/ipam/dhcp/main.go
@@ -36,7 +36,8 @@ func main() {
 		var hostPrefix string
 		daemonFlags := flag.NewFlagSet("daemon", flag.ExitOnError)
 		daemonFlags.StringVar(&pidfilePath, "pidfile", "", "optional path to write daemon PID to")
-		daemonFlags.StringVar(&hostPrefix, "hostprefix", "", "optional prefix to netns")
+		daemonFlags.StringVar(&hostPrefix, "hostprefix", "", "optional prefix to host root")
+		daemonFlags.StringVar(&socketPath, "socketpath", "", "optional dhcp server socketpath")
 		daemonFlags.Parse(os.Args[2:])
 
 		if err := runDaemon(pidfilePath, hostPrefix); err != nil {