1 parent
d354f4bea4
commit
bb134154a8
1 file changed
+2
-2
@@ -398,7 +398,7 @@ container_weave_addrs() {
|
|||||||
ip netns exec $NETNS ip addr show dev $CONTAINER_IFNAME
|
ip netns exec $NETNS ip addr show dev $CONTAINER_IFNAME
|
||||||
}
|
}
|
||||||
|
|
||||||
uname -s -r | sed -n 's|^\([^ ]*\) \([0-9]\+\)\.\([0-9]\+\).*|\1 \2 \3|p' | {
|
uname -s -r | sed -n -e 's|^\([^ ]*\) \([0-9][0-9]*\)\.\([0-9][0-9]*\).*|\1 \2 \3|p' | {
|
||||||
if ! read sys maj min ; then
|
if ! read sys maj min ; then
|
||||||
echo "ERROR: Unable to parse operating system version $(uname -s -r)" >&2
|
echo "ERROR: Unable to parse operating system version $(uname -s -r)" >&2
|
||||||
exit 1
|
exit 1
|
||||||
@@ -434,7 +434,7 @@ if ! ip netns list >/dev/null 2>&1 ; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! DOCKER_VERSION=$(docker -v | sed -n 's|^Docker version \([0-9]\+\.[0-9]\+.[0-9]\+\).*|\1|p') || [ -z "$DOCKER_VERSION" ] ; then
|
if ! DOCKER_VERSION=$(docker -v | sed -n -e 's|^Docker version \([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*|\1|p') || [ -z "$DOCKER_VERSION" ] ; then
|
||||||
echo "ERROR: Unable to parse docker version" >&2
|
echo "ERROR: Unable to parse docker version" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in new issue
Block a user