From: Julien Surloppe <julien@surloppe.fr>
Date: Fri, 1 Jun 2018 13:38:57 +0000 (+0200)
Subject: Patch lxc-update-config
X-Git-Tag: lxc-3.1.0~274^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49b8273ffc47961eb303c7e32c5239221b6e1498;p=thirdparty%2Flxc.git

Patch lxc-update-config

The current script doesn't generate a valid configuration for
lxc.network.ipv4 key, it lacking an .address part which lead to:

parse.c: lxc_file_for_each_line: 58 Failed to parse config: lxc.net.0.ipv4 = 192.168.10.101/24

Signed-off-by: Julien Surloppe <julien@surloppe.fr>
---

diff --git a/src/lxc/cmd/lxc-update-config.in b/src/lxc/cmd/lxc-update-config.in
index fd9110345..16a56dea1 100644
--- a/src/lxc/cmd/lxc-update-config.in
+++ b/src/lxc/cmd/lxc-update-config.in
@@ -102,7 +102,10 @@ while read -r LINE; do
 	# 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}"
+	sed -i \
+-e "${LINE_NUM} s/\([[:blank:]*]\|#*\)\(lxc\.network\)\(\.ipv[[:digit:]]\)\([[:blank:]]*\)=\(.*\)/\1lxc\.net\.${IDX}\3\.address\4=\5/g" \
+-e "${LINE_NUM} s/\([[:blank:]*]\|#*\)\(lxc\.network\)\.\([^[:digit:]*]\)/\1lxc\.net\.${IDX}\.\3/g" \
+	"${CONFIGPATH}"
 done < "${TMPFILE}"
 
 rm "${TMPFILE}"