From a28893915611d59ae53920d26b83c68eda958c4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Wed, 13 Aug 2014 08:58:10 +0200
Subject: [PATCH] Revert "network: use the same gateway IP generation method as
 backend"

This reverts commit 4ef785a01683fa638149fb55fdfbfbb2d23a7671.
Actually this change was wrong - the frontend IP was correct, the
problem was with backend IP.
---
 network/setup-ip | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/network/setup-ip b/network/setup-ip
index 2483298..907a295 100755
--- a/network/setup-ip
+++ b/network/setup-ip
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 if [ -x /usr/sbin/xenstore-read ]; then
 	XENSTORE_READ="/usr/sbin/xenstore-read"
@@ -9,16 +9,15 @@ fi
 ip=`$XENSTORE_READ qubes-ip 2> /dev/null`
 if [ x$ip != x ]; then
     netmask=`$XENSTORE_READ qubes-netmask`
-    primary_dns=`$XENSTORE_READ qubes-gateway`
+    gateway=`$XENSTORE_READ qubes-gateway`
     secondary_dns=`$XENSTORE_READ qubes-secondary-dns`
     /sbin/ifconfig $INTERFACE $ip netmask 255.255.255.255
     /sbin/ifconfig $INTERFACE up
-    gw_ip=${ip%.*}.1
-    /sbin/route add -host $gw_ip dev $INTERFACE
-    /sbin/route add default gw $gw_ip
+    /sbin/route add -host $gateway dev $INTERFACE
+    /sbin/route add default gw $gateway
     /sbin/ethtool -K $INTERFACE sg off
     /sbin/ethtool -K $INTERFACE tx off
-    echo "nameserver $primary_dns" > /etc/resolv.conf
+    echo "nameserver $gateway" > /etc/resolv.conf
     echo "nameserver $secondary_dns" >> /etc/resolv.conf
 	network=$($XENSTORE_READ qubes-netvm-network 2>/dev/null)
 	if [ "x$network" != "x" ]; then