From 4ac04e4c2bd1aa5c48d86d3bebb50fd9fdf2e1bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Tue, 6 Oct 2015 15:29:30 +0200
Subject: [PATCH] network: fix 'qubes-uplink-eth0' NetworkManager connection
 (#1280)

According to the specification[1], the setting name is 'addresses', not
'address'.  The later apparently worked on some NetworkManager versions,
but for example not on the one in Debian wheezy. Also fix value
format (IP;netmask;gateway).

[1] htts://developer.gnome.org/NetworkManager/unstable/ref-settings.html

Fixes QubesOS/qubes-issues#1280

(cherry picked from commit 580d21acdc3f83dee4bd2e8512d8c57d5045765a)
---
 network/setup-ip | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/network/setup-ip b/network/setup-ip
index 30cd11c..ab7a03c 100755
--- a/network/setup-ip
+++ b/network/setup-ip
@@ -54,9 +54,9 @@ __EOF__
             echo "dns=$gateway;$secondary_dns" >> $nm_config
         fi
         if [ "x$disablegw" != "x1" ]; then
-            echo "address1=$ip/32,$gateway" >> $nm_config
+            echo "addresses1=$ip;32;$gateway" >> $nm_config
         else
-            echo "address1=$ip/32" >> $nm_config
+            echo "addresses1=$ip;32" >> $nm_config
         fi
         chmod 600 $nm_config
     fi