Add partial support for non-FHS host systems
Fixes weaveworks/weave#2733 partially, where <host>/etc/resolv.conf is not a symlink
This commit is contained in:
1 parent
81add75258
commit
d881f47088
1 file changed
+10
-1
@@ -1667,7 +1667,16 @@ launch_router() {
|
||||
--label=weavevolumes $WEAVEDB_IMAGE >/dev/null
|
||||
fi
|
||||
|
||||
RESOLV_CONF=$(chroot ${HOST_ROOT:-/} readlink -f /etc/resolv.conf)
|
||||
# Figure out the location of the actual resolv.conf file because
|
||||
# we want to bind mount its directory into the container.
|
||||
if [ -L ${HOST_ROOT:-/}/etc/resolv.conf ]; then # symlink
|
||||
# This assumes a host with readlink in FHS directories...
|
||||
# Ideally, this would resolve the symlink manually, without
|
||||
# using host commands.
|
||||
RESOLV_CONF=$(chroot ${HOST_ROOT:-/} readlink -f /etc/resolv.conf)
|
||||
else
|
||||
RESOLV_CONF=/etc/resolv.conf
|
||||
fi
|
||||
RESOLV_CONF_DIR=$(dirname "$RESOLV_CONF")
|
||||
RESOLV_CONF_BASE=$(basename "$RESOLV_CONF")
|
||||
|
||||
|
||||
Reference in new issue
Block a user