Changeset 10827 in hybrid for branches/releng-9.0/nanobsd

Timestamp:

May 13, 2012, 1:01:55 PM (13 years ago)

Author:

rick

Message:

Make sure to load the wleiden.yaml from the proper location.

While here do cleanups at wl-config to make the path display more logical. Do
not show the fact that /usr/local/etc is symlinked to /etc/local. By doing so,
we make sure stuff will be more consistent.

Related-To: nodefactory:ticket:164

Location:

branches/releng-9.0/nanobsd/files

Files:

• tools/wl-config (modified) (2 diffs)
• usr/local/www/wlportal/index.cgi (modified) (1 diff)

branches/releng-9.0/nanobsd/files/tools/wl-config

@@ -44 +44 @@
   'dhcpd.conf')
      STARTUP_LOC="/cfg/local/${FILE}"
-     RUNNING_LOC="/etc/local/${FILE}"
+     RUNNING_LOC="/usr/local/etc/${FILE}"
      FILE_HINT="service isc-dhcpd restart"
    ;;
   'dnsmasq.conf')
      STARTUP_LOC="/cfg/local/${FILE}"
-     RUNNING_LOC="/etc/local/${FILE}"
+     RUNNING_LOC="/usr/local/etc/${FILE}"
      FILE_HINT="service dnsmasq restart"
    ;;
@@ -78 +78 @@
    'wleiden.yaml')
      STARTUP_LOC="/cfg/local/${FILE}"
-     RUNNING_LOC="/etc/local/${FILE}"
+     RUNNING_LOC="/usr/local/etc/${FILE}"
    ;;
   esac

branches/releng-9.0/nanobsd/files/usr/local/www/wlportal/index.cgi

@@ -86 +86 @@
   'tmpl_login'    : '/usr/local/etc/wlportal/login.tmpl',
   'whitelist'     : [],
-  'config_files'  : ['/usr/local/etc/wlportal/config.yaml','/etc/wleiden.yaml'],
+  'config_files'  : ['/usr/local/etc/wlportal/config.yaml','/usr/local/etc/wleiden.yaml'],
   'expire_time'   : None,
   'accessdb'      : '/var/db/clients',