diff options
| author | Jim P <jim@pingle.org> | 2013-07-13 11:50:29 -0700 |
|---|---|---|
| committer | Jim P <jim@pingle.org> | 2013-07-13 11:50:29 -0700 |
| commit | 6a4e4405e1e4bd005f50a8e094431897160021dc (patch) | |
| tree | c13f2a1acba1501cc527b181663501e83ec2cde0 /etc | |
| parent | 68bbaf061efc551fd2a2446464b1bb06bbc53fe1 (diff) | |
| parent | 9590e0de97bef964f16117f0094db24406754b64 (diff) | |
| download | pfsense-6a4e4405e1e4bd005f50a8e094431897160021dc.zip pfsense-6a4e4405e1e4bd005f50a8e094431897160021dc.tar.gz | |
Merge pull request #711 from phil-davis/master
Teach services code about start stop restart of dhcrelay6
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/service-utils.inc | 25 | ||||
| -rw-r--r-- | etc/inc/services.inc | 2 |
2 files changed, 26 insertions, 1 deletions
diff --git a/etc/inc/service-utils.inc b/etc/inc/service-utils.inc index af90809..a3f3111 100644 --- a/etc/inc/service-utils.inc +++ b/etc/inc/service-utils.inc @@ -295,6 +295,13 @@ function get_services() { $services[] = $pconfig; } + if(isset($config['dhcrelay6']['enable'])) { + $pconfig = array(); + $pconfig['name'] = "dhcrelay6"; + $pconfig['description'] = gettext("DHCPv6 Relay"); + $services[] = $pconfig; + } + if(is_dhcp_server_enabled()) { $pconfig = array(); $pconfig['name'] = "dhcpd"; @@ -417,6 +424,9 @@ function get_service_status($service) { case "vhosts-http": $running = is_pid_running("{$g['varrun_path']}/vhosts-http.pid"); break; + case "dhcrelay6": + $running = is_pid_running("{$g['varrun_path']}/dhcrelay6.pid"); + break; default: $running = is_service_running($service['name']); } @@ -513,6 +523,12 @@ function service_control_start($name, $extras) { case 'bsnmpd': services_snmpd_configure(); break; + case 'dhcrelay': + services_dhcrelay_configure(); + break; + case 'dhcrelay6': + services_dhcrelay6_configure(); + break; case 'dnsmasq': services_dnsmasq_configure(); break; @@ -575,6 +591,9 @@ function service_control_stop($name, $extras) { case 'dhcrelay': killbypid("{$g['varrun_path']}/dhcrelay.pid"); break; + case 'dhcrelay6': + killbypid("{$g['varrun_path']}/dhcrelay6.pid"); + break; case 'dnsmasq': killbypid("{$g['varrun_path']}/dnsmasq.pid"); break; @@ -626,6 +645,12 @@ function service_control_restart($name, $extras) { case 'bsnmpd': services_snmpd_configure(); break; + case 'dhcrelay': + services_dhcrelay_configure(); + break; + case 'dhcrelay6': + services_dhcrelay6_configure(); + break; case 'dnsmasq': services_dnsmasq_configure(); break; diff --git a/etc/inc/services.inc b/etc/inc/services.inc index f206177..a3c457f 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -1505,7 +1505,7 @@ function services_dhcrelay6_configure() { return; /* XXX */ } - $cmd = "/usr/local/sbin/dhcrelay -6 -pf \"{$g['varetc_path']}/dhcrelay6.pid\""; + $cmd = "/usr/local/sbin/dhcrelay -6 -pf \"{$g['varrun_path']}/dhcrelay6.pid\""; foreach ($dhcrelayifs as $dhcrelayif) { $cmd .= " -l {$dhcrelayif}"; } |
