From 8897603ad02042f916911c406eb47f0b36d1f831 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sat, 12 Jul 2014 22:56:40 +0200
Subject: services: networking: Set interfaces up; delete default route only
 when needed.

* gnu/services/networking.scm (static-networking-service): Use -i, -A,
  and --up with Inetutils' ifconfig.  Do 'route del -net default' only
  when GATEWAY is true.
---
 gnu/services/networking.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'gnu/services')

diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index f03161fe58..7abcd9ed15 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -55,7 +55,8 @@ gateway."
                  ;; Return #t if successfully started.
                  (and (zero? (system* (string-append #$inetutils
                                                      "/bin/ifconfig")
-                                      #$interface #$ip "up"))
+                                      "-i" #$interface "-A" #$ip
+                                      "-i" #$interface "--up"))
                       #$(if gateway
                             #~(zero? (system* (string-append #$net-tools
                                                              "/sbin/route")
@@ -77,8 +78,11 @@ gateway."
                 ;; Return #f is successfully stopped.
                 (not (and (system* (string-append #$inetutils "/bin/ifconfig")
                                    #$interface "down")
-                          (system* (string-append #$net-tools "/sbin/route")
-                                   "del" "-net" "default")))))
+                          #$(if gateway
+                                #~(system* (string-append #$net-tools
+                                                          "/sbin/route")
+                                           "del" "-net" "default")
+                                #t)))))
       (respawn? #f)))))
 
 ;;; networking.scm ends here
-- 
cgit 1.4.1