Project

General

Profile

« Previous | Next » 

Revision 3fa4d6fe

Added by Christian McDonald almost 2 years ago

Revert "dhcp: support simultaneous v4 dhcpd and dhcrelay, Implements #14620"

This reverts commit e9577ebfd7852646a66697a3bde41b712687a4ca.

View differences:

src/etc/inc/service-utils.inc
379 379
	if (config_path_enabled('dhcrelay')) {
380 380
		$pconfig = array();
381 381
		$pconfig['name'] = "dhcrelay";
382
		$pconfig['description'] = gettext('ISC DHCP Relay Agent');
382
		$pconfig['description'] = gettext("DHCP Relay");
383 383
		$pconfig['enabled'] = true;
384 384
		$pconfig['status'] = get_service_status($pconfig);
385 385
		$services[] = $pconfig;
......
388 388
	if (config_path_enabled('dhcrelay6')) {
389 389
		$pconfig = array();
390 390
		$pconfig['name'] = "dhcrelay6";
391
		$pconfig['description'] = gettext('ISC DHCPv6 Relay Agent');
391
		$pconfig['description'] = gettext("DHCPv6 Relay");
392 392
		$pconfig['enabled'] = true;
393 393
		$pconfig['status'] = get_service_status($pconfig);
394 394
		$services[] = $pconfig;
......
397 397
	if (is_dhcp_server_enabled()) {
398 398
		$pconfig = array();
399 399
		$pconfig['name'] = "dhcpd";
400
		$pconfig['description'] = gettext('ISC DHCP Server');
400
		$pconfig['description'] = gettext("DHCP Service");
401 401
		$pconfig['enabled'] = true;
402 402
		$pconfig['status'] = get_service_status($pconfig);
403 403
		$services[] = $pconfig;
......
479 479

  
480 480
function find_service_by_name($name) {
481 481
	$services = get_services();
482

  
482
	
483 483
	foreach ($services as $service) {
484 484
		if (isset($service["name"]) && ($service["name"] == $name)) {
485 485
			return $service;

Also available in: Unified diff