[lxc-devel] [lxc/master] Patch lxc-update-config

[jsurloppe on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 581 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180601/3454707b/attachment.bin>
-------------- next part --------------
From 49b8273ffc47961eb303c7e32c5239221b6e1498 Mon Sep 17 00:00:00 2001
From: Julien Surloppe <julien at surloppe.fr>
Date: Fri, 1 Jun 2018 15:38:57 +0200
Subject: [PATCH] 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 at surloppe.fr>
---
 src/lxc/cmd/lxc-update-config.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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}"