rootfs: use /etc/wr_date.conf not /wr/etc/wr_date.conf

Keep created wr_date.conf in /etc not in /wr/etc. There is no need to keep it in the flash instead of ramdisk. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

rootfs: use /etc/wr_date.conf not /wr/etc/wr_date.conf
Keep created wr_date.conf in /etc not in /wr/etc. There is no need to keep it in the flash instead of ramdisk. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
9cc442c8 · Adam Wujek · d53ab687 · 9cc442c8 · 9cc442c8 · 9cc442c8
Commit 9cc442c8 authored Aug 12, 2016 by Adam Wujek 💬
4 changed files
--- a/doc/wrs-user-manual.in
+++ b/doc/wrs-user-manual.in
@@ -548,7 +548,7 @@ value is changed by the web interface, proper action is taken.
 	The NTP server used to prime White Rabbit time, at system boot.
        The option can be an IP address or a host name, if DNS is properly
        configured.  The configuration value is stored in
-        @t{/wr/etc/wr_date.conf}. An empty string (default) disables
+        @t{/etc/wr_date.conf}. An empty string (default) disables
        NTP access at boot time.

 @item CONFIG_DNS_SERVER
@@ -1227,7 +1227,7 @@ The following tools and scripts are provided:
        White Rabbit time to the current TAI value.  The program is
        meant to prime the White Rabbit counter at boot time, and is
        run by @t{/etc/init.d/wr_date} -- this script uses NTP
-        to set host time as a first step, if @t{/wr/etc/wr_date.conf}
+        to set host time as a first step, if @t{/etc/wr_date.conf}
        exists and includes a line of the form @t{ntpserver 192.168.16.1}.

        With ``@t{wr_date get}'' you can read White Rabbit time, and

--- a/userspace/rootfs_override/etc/init.d/wr_date
+++ b/userspace/rootfs_override/etc/init.d/wr_date
@@ -3,7 +3,7 @@
 # First of all, run wr_date, so to fix tai_offset in the kernel
 /wr/bin/wr_date get > /dev/null

-F=/wr/etc/wr_date.conf
+F=/etc/wr_date.conf

 date_set=0
 # check whether there is config file

--- a/userspace/rootfs_override/wr/bin/apply_dot-config
+++ b/userspace/rootfs_override/wr/bin/apply_dot-config
@@ -71,9 +71,7 @@ sed -i "s,^root:[^:]*:,root:$passwd:," /etc/shadow
 # A non-existent wr_date.conf means no NTP. So "rm" if unconfigured
 if [ ! -z "$CONFIG_NTP_SERVER" ]; then
    echo "ntpserver $CONFIG_NTP_SERVER" > $T
-    copy_conf /wr/etc/wr_date.conf
-else
-    rm -f /wr/etc/wr_date.conf
+    cp $T /etc/wr_date.conf
 fi

 # /etc/resolv.conf can be empty, so start empty

--- a/userspace/tools/wr_date.c
+++ b/userspace/tools/wr_date.c
@@ -23,7 +23,7 @@
 #ifndef MOD_TAI
 #define MOD_TAI 0x80
 #endif
-#define WRDATE_CFG_FILE "/wr/etc/wr_date.conf"
+#define WRDATE_CFG_FILE "/etc/wr_date.conf"
 #define WRDATE_LEAP_FILE "/etc/leap-seconds.list"

 /* Address for hardware, from nic-hardware.h */