From af3d2c7e7fc25dd89cd9ab05ad397fd6b7924bd2 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Tue, 23 Dec 2014 12:27:13 +0000 Subject: [PATCH] cosmetic: break overlong lines --- weave | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/weave b/weave index 3209cdd0..850fed37 100755 --- a/weave +++ b/weave @@ -439,7 +439,10 @@ case "$COMMAND" in # Set WEAVE_DOCKER_ARGS in the environment in order to supply # additional parameters, such as resource limits, to docker # when launching the weave container. - CONTAINER=$(docker run --privileged -d --name=$CONTAINER_NAME -p $PORT:$PORT/tcp -p $PORT:$PORT/udp ${PASSWORD:+-e WEAVE_PASSWORD="$PASSWORD"} ${PASSWORDFILE:+--env-file="$PASSWORDFILE"} $WEAVE_DOCKER_ARGS $IMAGE -name $MACADDR -iface $CONTAINER_IFNAME "$@") + CONTAINER=$(docker run --privileged -d --name=$CONTAINER_NAME \ + -p $PORT:$PORT/tcp -p $PORT:$PORT/udp \ + ${PASSWORD:+-e WEAVE_PASSWORD="$PASSWORD"} ${PASSWORDFILE:+--env-file="$PASSWORDFILE"} \ + $WEAVE_DOCKER_ARGS $IMAGE -name $MACADDR -iface $CONTAINER_IFNAME "$@") with_container_netns $CONTAINER launch >/dev/null echo $CONTAINER ;; @@ -450,7 +453,9 @@ case "$COMMAND" in check_not_running $DNS_CONTAINER_NAME $DNS_IMAGE create_bridge docker_bridge_ip - DNS_CONTAINER=$(docker run --privileged -d --name=$DNS_CONTAINER_NAME -p $DOCKER_BRIDGE_IP:53:53/udp -v /var/run/docker.sock:/var/run/docker.sock $DNS_IMAGE -iface $CONTAINER_IFNAME "$@") + DNS_CONTAINER=$(docker run --privileged -d --name=$DNS_CONTAINER_NAME \ + -p $DOCKER_BRIDGE_IP:53:53/udp -v /var/run/docker.sock:/var/run/docker.sock \ + $DNS_IMAGE -iface $CONTAINER_IFNAME "$@") with_container_netns $DNS_CONTAINER attach $CIDR >/dev/null populate_dns echo $DNS_CONTAINER