The following pull request was submitted through Github. It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/1763
This e-mail was sent by the LXC bot, direct replies will not reach the author unless they happen to be subscribed to this list. === Description (from pull-request) === Older instances of liblxc allowed to specify networks like this: lxc.network.type = veth lxc.network.flags = up lxc.network.link = lxdbr0 lxc.network.name= eth0 lxc.network.type = veth lxc.network.flags = up lxc.network.link = lxdbr0 lxc.network.name = eth1 Each occurrence of "lxc.network.type" indicated the definition of a new network. This syntax is not allowed in newer liblxc instances. Instead, network must carry an index. So in new liblxc these two networks would be translated to: lxc.net.0.type = veth lxc.net.0.flags = up lxc.net.0.link = lxdbr0 lxc.net.0.name= eth0 lxc.net.1.type = veth lxc.net.1.flags = up lxc.net.1.link = lxdbr0 lxc.net.1.name = eth1 The update script did not handle this case correctly. It should now. Signed-off-by: Christian Brauner <[email protected]>
From 37694da4b5b3dc0ef17ae8372251bd26de58ee4b Mon Sep 17 00:00:00 2001 From: Christian Brauner <[email protected]> Date: Mon, 28 Aug 2017 16:34:07 +0200 Subject: [PATCH] lxc-update-config: handle legacy networks Older instances of liblxc allowed to specify networks like this: lxc.network.type = veth lxc.network.flags = up lxc.network.link = lxdbr0 lxc.network.name= eth0 lxc.network.type = veth lxc.network.flags = up lxc.network.link = lxdbr0 lxc.network.name = eth1 Each occurrence of "lxc.network.type" indicated the definition of a new network. This syntax is not allowed in newer liblxc instances. Instead, network must carry an index. So in new liblxc these two networks would be translated to: lxc.net.0.type = veth lxc.net.0.flags = up lxc.net.0.link = lxdbr0 lxc.net.0.name= eth0 lxc.net.1.type = veth lxc.net.1.flags = up lxc.net.1.link = lxdbr0 lxc.net.1.name = eth1 The update script did not handle this case correctly. It should now. Signed-off-by: Christian Brauner <[email protected]> --- src/lxc/tools/lxc-update-config.in | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/src/lxc/tools/lxc-update-config.in b/src/lxc/tools/lxc-update-config.in index 3aef5b12b..3a9defd11 100644 --- a/src/lxc/tools/lxc-update-config.in +++ b/src/lxc/tools/lxc-update-config.in @@ -14,7 +14,7 @@ EOF return 0 } -OPTIONS=`getopt -o c:h --long config:,help -- "${@}"` +OPTIONS=$(getopt -o c:h --long config:,help -- "${@}") eval set -- "${OPTIONS}" while true; do @@ -37,8 +37,9 @@ while true; do esac done -echo "${CONFIGPATH}" -sed -i".backup" \ +cp "${CONFIGPATH}" "${CONFIGPATH}.backup" + +sed -i \ -e 's/\([[:blank:]*]\|#*\)\(lxc\.rootfs\)\([[:blank:]*]\|=\)/\1lxc\.rootfs\.path\3/g' \ -e 's/\([[:blank:]*]\|#*\)\(lxc\.id_map\)\([[:blank:]*]\|=\)/\1lxc\.idmap\3/g' \ -e 's/\([[:blank:]*]\|#*\)\(lxc\.pts\)\([[:blank:]*]\|=\)/\1lxc\.pty\.max\3/g' \ @@ -62,7 +63,36 @@ sed -i".backup" \ -e 's/\([[:blank:]*]\|#*\)\(lxc\.init_uid\)\([[:blank:]*]\|=\)/\1lxc\.init\.uid\3/g' \ -e 's/\([[:blank:]*]\|#*\)\(lxc\.init_gid\)\([[:blank:]*]\|=\)/\1lxc\.init\.gid\3/g' \ -e 's/\([[:blank:]*]\|#*\)\(lxc\.limit\)\([[:blank:]*]\|=\)/\1lxc\.prlimit\3/g' \ --e 's/\([[:blank:]*]\|#*\)\(lxc\.network\)\.\([^[:digit:]*]\)/\1lxc\.net\.0\.\3/g' \ -e 's/\([[:blank:]*]\|#*\)\(lxc\.network\)\(\.[[:digit:]*]\)/\1lxc\.net\3/g' \ -e 's/\([[:blank:]*]\|#*\)\(lxc\.network\)\([[:blank:]*]\|=\)/\1lxc\.net\3/g' \ "${CONFIGPATH}" + +# Finally, deal with network definitions of the following form: +# +# lxc.network.type = veth +# lxc.network.flags = up +# lxc.network.link = lxdbr0 +# lxc.network.name= eth0 +# +# lxc.network.type = veth +# lxc.network.flags = up +# lxc.network.link = lxdbr0 +# lxc.network.name = eth1 + +set +e + +TMPFILE=$(mktemp -p "${PWD}" XXXXXXXXXX) +cp "${CONFIGPATH}" "${TMPFILE}" + +LINE_NUM=0 +IDX=-1 +while read -r LINE; do + LINE_NUM=$((LINE_NUM+1)) + # A "lxc.network.type" key defines a new network. So everytime we see + # one we bump IDX and replace any "lxc.network.<subkey>" keys we + # encounter with "lxc.network.<IDX>.<subkey>". + echo "${LINE}" | grep -q "lxc.network.type" && IDX=$((IDX+1)) + sed -i -e "${LINE_NUM} s/\([[:blank:]*]\|#*\)\(lxc\.network\)\.\([^[:digit:]*]\)/\1lxc\.net\.${IDX}\.\3/g" "${CONFIGPATH}" +done < "${TMPFILE}" + +rm "${TMPFILE}"
_______________________________________________ lxc-devel mailing list [email protected] http://lists.linuxcontainers.org/listinfo/lxc-devel
