From ab8fa0f5ec107a7c1afd23012b0e6e9cb445a2b0 Mon Sep 17 00:00:00 2001 From: "W. Eric Norum" Date: Fri, 5 Sep 2008 21:41:06 +0000 Subject: [PATCH] Allow EPICS_TS_NTP_INET in environment to override NTP server setting. --- src/RTEMS/base/rtems_init.c | 3 +++ src/RTEMS/base/setBootConfigFromNVRAM.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/RTEMS/base/rtems_init.c b/src/RTEMS/base/rtems_init.c index 32eeb2745..77cb54e89 100644 --- a/src/RTEMS/base/rtems_init.c +++ b/src/RTEMS/base/rtems_init.c @@ -416,6 +416,7 @@ Init (rtems_task_argument ignored) { int i; char *argv[3] = { NULL, NULL, NULL }; + char *cp; rtems_task_priority newpri; rtems_status_code sc; rtems_time_of_day now; @@ -462,6 +463,8 @@ Init (rtems_task_argument ignored) /* * Start network */ + if ((cp = getenv("EPICS_TS_NTP_INET")) != NULL) + rtems_bsdnet_config.ntp_server[0] = cp; if (rtems_bsdnet_config.network_task_priority == 0) { unsigned int p; diff --git a/src/RTEMS/base/setBootConfigFromNVRAM.c b/src/RTEMS/base/setBootConfigFromNVRAM.c index 4652a9bb9..702e1f2cc 100644 --- a/src/RTEMS/base/setBootConfigFromNVRAM.c +++ b/src/RTEMS/base/setBootConfigFromNVRAM.c @@ -202,7 +202,6 @@ setBootConfigFromNVRAM(void) rtems_bsdnet_config.ntp_server[0] = gev("epics-ntpserver", nvp); if (rtems_bsdnet_config.ntp_server[0] == NULL) rtems_bsdnet_config.ntp_server[0] = rtems_bsdnet_bootp_server_name; - epicsEnvSet("EPICS_TS_NTP_INET",rtems_bsdnet_config.ntp_server[0]); if ((cp = gev("epics-tz", nvp)) != NULL) epicsEnvSet("TZ", cp); } @@ -319,7 +318,6 @@ setBootConfigFromNVRAM(void) rtems_bsdnet_bootp_server_name = env("SERVER", "192.168.0.1"); rtems_bsdnet_config.name_server[0] = env("NAMESERVER", rtems_bsdnet_bootp_server_name); rtems_bsdnet_config.ntp_server[0] = env("NTPSERVER", rtems_bsdnet_bootp_server_name); - epicsEnvSet("EPICS_TS_NTP_INET",rtems_bsdnet_config.ntp_server[0]); cp1 = env("DOMAIN", NULL); if (cp1 != NULL) rtems_bsdnet_config.domainname = cp1;