From f22803c0f6c824067d6470e44f09c5a41769f6c5 Mon Sep 17 00:00:00 2001 From: "W. Eric Norum" Date: Mon, 29 Aug 2005 20:07:52 +0000 Subject: [PATCH] Allow environment to override default domain. --- src/RTEMS/base/setBootConfigFromNVRAM.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/RTEMS/base/setBootConfigFromNVRAM.c b/src/RTEMS/base/setBootConfigFromNVRAM.c index d337b663a..39fe9a06f 100644 --- a/src/RTEMS/base/setBootConfigFromNVRAM.c +++ b/src/RTEMS/base/setBootConfigFromNVRAM.c @@ -226,8 +226,9 @@ setBootConfigFromNVRAM(void) 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]); - if (rtems_bsdnet_config.domainname == NULL) - rtems_bsdnet_config.domainname = env("DOMAIN", "local"); + cp1 = env("DOMAIN", NULL); + if (cp1 == NULL) + rtems_bsdnet_config.domainname = cp1; rtems_bsdnet_config.hostname = env("HOSTNAME", "iocNobody"); rtems_bsdnet_config.ifconfig->ip_address = env("IPADDR0", "192.168.0.2"); rtems_bsdnet_bootp_boot_file_name = env("BOOTFILE", "epics/iocNobody/bin/RTEMS-uC5282/myApp.boot");