diff options
| author | gnhb <gnoahb@gmail.com> | 2010-06-07 23:24:17 +0700 |
|---|---|---|
| committer | gnhb <gnoahb@gmail.com> | 2010-06-07 23:24:17 +0700 |
| commit | 277d0250b0b344893c166df91cb66c2269ade1de (patch) | |
| tree | 366643a754c140a34db43d4266c8a88b5ca49e60 /etc/rc.bootup | |
| parent | c1cc447c5d439e973f7d0915d95ad998c575eb65 (diff) | |
| parent | 692730bf32b6658bee626c2bb58ffce54b7bcb14 (diff) | |
| download | pfsense-277d0250b0b344893c166df91cb66c2269ade1de.zip pfsense-277d0250b0b344893c166df91cb66c2269ade1de.tar.gz | |
Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp
Conflicts:
etc/inc/interfaces.inc
etc/inc/pfsense-utils.inc
Diffstat (limited to 'etc/rc.bootup')
| -rwxr-xr-x | etc/rc.bootup | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/etc/rc.bootup b/etc/rc.bootup index 2f977f3..eb5a0b4 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -331,9 +331,6 @@ enable_rrd_graphing(); /* start DHCP service */ services_dhcpd_configure(); -/* start DHCP logging service which populates /etc/hosts */ -services_parse_dhcpd_hostnames(); - /* startup OLSR if needed */ setup_wireless_olsr(); |
