Flush routes _before_ adding the IP

on-prem · Feb 22, 2018 · 4288ea3 · 4288ea3
1 parent 8f0e05e
commit 4288ea3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.9.0 (2018-02-22)
+
+  * [bugfix] IPv6 routes should be removed before configuring the IP, not after
+
 ## 1.8.0 (2017-11-21)
 
   * Display 'Failed' if the IP or NTP configuration fails

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2016 Alexander Williams, Unscramble <license@unscramble.jp>
+Copyright (c) 2015-2018 Alexander Williams, Unscramble <license@unscramble.jp>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/module.l b/module.l
@@ -1,8 +1,8 @@
 [de MODULE_INFO
   ("name"       "tinycore-network")
-  ("version"    "1.8.0")
+  ("version"    "1.9.0")
   ("summary"    "TinyCore static/dhcp networking")
   ("source"     "https://a1w.ca")
   ("author"     "Alexander Williams")
   ("license"    "MIT")
-  ("copyright"  "(c) 2015-2017 Alexander Williams, Unscramble <license@unscramble.jp>") ]
+  ("copyright"  "(c) 2015-2018 Alexander Williams, Unscramble <license@unscramble.jp>") ]
diff --git a/network.sh b/network.sh
@@ -3,9 +3,9 @@
 # TinyCore static/dhcp networking
 #
 # MIT License
-# Copyright (c) 2015-2017 Alexander Williams, Unscramble <license@unscramble.jp>
+# Copyright (c) 2015-2018 Alexander Williams, Unscramble <license@unscramble.jp>
 #
-# VERSION: 1.8.0
+# VERSION: 1.9.0
 
 . /etc/init.d/tc-functions
 set -a

diff --git a/udhcpc.script b/udhcpc.script
@@ -20,6 +20,15 @@ case "$1" in
     ;;
 
   renew|bound)
+    # flush routes first
+    if [ -n "$router" ] ; then
+      echo "deleting routers"
+      while route del default gw 0.0.0.0 dev $interface ; do
+        :
+      done
+      [ -n "$subnet_ipv6" ] && $IP_COMMAND -6 route flush dev $interface
+    fi
+
     echo "adding ip $ip"
     if [ -n "$subnet_ipv6" ]; then
       $IP_COMMAND -6 addr add ${ip}${subnet_ipv6} dev $interface
@@ -30,13 +39,6 @@ case "$1" in
     /sbin/ifconfig $interface | grep -q "inet addr"
 
     if [ -n "$router" ] ; then
-      echo "deleting routers"
-      while route del default gw 0.0.0.0 dev $interface ; do
-        :
-      done
-
-      [ -n "$subnet_ipv6" ] && $IP_COMMAND -6 route flush dev $interface
-
       metric=0
       for i in $router ; do
         echo "adding routers $i"