diff options
author | Renato Botelho <renato@netgate.com> | 2015-07-31 15:40:46 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-07-31 15:40:46 -0300 |
commit | 6fa9f38c0c1377ab110ff97d0ba552c878e9e07e (patch) | |
tree | 2d80ccf2687d0ee070a7f5cb5ac20b5008b47f12 /etc/inc/system.inc | |
parent | bb3ee8a1bb3aaa79afec827363362a623cb62e4d (diff) | |
download | pfsense-6fa9f38c0c1377ab110ff97d0ba552c878e9e07e.zip pfsense-6fa9f38c0c1377ab110ff97d0ba552c878e9e07e.tar.gz |
Drop support for jail platform
Diffstat (limited to 'etc/inc/system.inc')
-rw-r--r-- | etc/inc/system.inc | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index a215e72..d7c6226 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -41,9 +41,7 @@ function activate_powerd() { global $config, $g; - if ($g['platform'] == 'jail') { - return; - } + if (is_process_running("powerd")) { exec("/usr/bin/killall powerd"); } @@ -119,10 +117,6 @@ function system_get_sysctls() { function activate_sysctls() { global $config, $g, $sysctls; - if ($g['platform'] == 'jail') { - return; - } - if (is_array($config['sysctl']) && is_array($config['sysctl']['item'])) { foreach ($config['sysctl']['item'] as $tunable) { if ($tunable['value'] == "default") { @@ -454,9 +448,6 @@ function system_hosts_generate() { function system_dhcpleases_configure() { global $config, $g; - if ($g['platform'] == 'jail') { - return; - } /* Start the monitoring process for dynamic dhcpclients. */ if ((isset($config['dnsmasq']['enable']) && isset($config['dnsmasq']['regdhcp'])) || (isset($config['unbound']['enable']) && isset($config['unbound']['regdhcp']))) { @@ -519,9 +510,7 @@ function system_hostname_configure() { function system_routing_configure($interface = "") { global $config, $g; - if ($g['platform'] == 'jail') { - return; - } + if (isset($config['system']['developerspew'])) { $mt = microtime(); echo "system_routing_configure() being called $mt\n"; @@ -1638,10 +1627,6 @@ function system_ntp_configure($start_ntpd=true) { $statsdir = "/var/log/ntp"; $gps_device = '/dev/gps0'; - if ($g['platform'] == 'jail') { - return; - } - safe_mkdir($statsdir); if (!is_array($config['ntpd'])) { |