Ensure NTP is configured after IP

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.7.0 (2017-11-21)
+
+  * [bugfix] Ensure NTP is configured after the interface is configured
+  * Increase NTP server timeout to 60 seconds (20 seconds per attempt)
+  * Send NTP setup queries to log file
+  * Add module.l with module info
+
 ## 1.6.0 (2017-10-14)
 
   * Restore "sleep" (10s) while waiting for network interface

module.l

@@ -0,0 +1,8 @@
+[de MODULE_INFO
+  ("name"       "tinycore-network")
+  ("version"    "1.7.0")
+  ("summary"    "TinyCore static/dhcp networking")
+  ("source"     "https://a1w.ca")
+  ("author"     "Alexander Williams")
+  ("license"    "MIT")
+  ("copyright"  "(c) 2015-2017 Alexander Williams, Unscramble <[email protected]>") ]

network.sh

@@ -4,22 +4,25 @@
 #
 # MIT License
 # Copyright (c) 2015-2017 Alexander Williams, Unscramble <[email protected]>
+#
+# VERSION: 1.7.0
 
 . /etc/init.d/tc-functions
 set -a
 
 config="/usr/local/etc/network.conf"
 ntp_tries=0
-ntptimeout=30 # seconds
+ntptimeout=60 # seconds
+ntpretry=20   # seconds
 interface_tries=0
 
 /sbin/udevadm settle --timeout=5
 
 set_ntpdate() {
   if [ ${ntpserver-} ]; then
-    ntp_tries=$(( $ntp_tries + 10 ))
+    ntp_tries=$(( $ntp_tries + $ntpretry ))
     if [ "$ntp_tries" -le "$ntptimeout" ]; then
-      /usr/bin/timeout -t 10 /usr/sbin/ntpd -d -n -q -p "$ntpserver" >/dev/null 2>&1 || set_ntpdate
+      /usr/bin/timeout -t $ntpretry /usr/sbin/ntpd -d -n -q -p "$ntpserver" >>/var/log/ntp.log 2>&1 || set_ntpdate
     fi
   fi
 }
@@ -50,15 +53,6 @@ if [ -f "$config" ]; then
   check_interface
   echo "${GREEN} Done.${NORMAL}"
 
-  if [ "$ntpserver" ]; then
-    echo -n "${GREEN}Waiting ${MAGENTA}${ntptimeout}s${GREEN} for NTP from ${MAGENTA}$ntpserver${NORMAL}"
-    echo "$ntpserver" > /etc/sysconfig/ntpserver
-    set_ntpdate
-    echo "${GREEN} Done.${NORMAL}"
-  else
-    > /etc/sysconfig/ntpserver
-  fi
-
   case "$mode" in
     static)
       /opt/network_static.sh
@@ -67,6 +61,16 @@ if [ -f "$config" ]; then
       /opt/network_dhcp.sh
       ;;
   esac
+
+  # configure NTP after the interface is configured
+  if [ "$ntpserver" ]; then
+    echo -n "${GREEN}Waiting up to ${MAGENTA}${ntptimeout}s${GREEN} for NTP from ${MAGENTA}$ntpserver${NORMAL}"
+    echo "$ntpserver" > /etc/sysconfig/ntpserver
+    set_ntpdate
+    echo "${GREEN} Done.${NORMAL}"
+  else
+    > /etc/sysconfig/ntpserver
+  fi
 else
   echo "${RED}Missing network config: ${RED}${config}${NORMAL}"
   exit 1