diff options
| author | jim-p <jimp@pfsense.org> | 2010-11-09 14:35:30 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2010-11-09 14:35:30 -0500 |
| commit | 56c7473bf7c1d08868846aa765f357e9f0b3aef4 (patch) | |
| tree | b019a25954217ecdec04e77192fae5f49b382792 /config/cron | |
| parent | 73665ee51381051f7174a0ea967f30a0bf42f3ae (diff) | |
| download | pfsense-packages-56c7473bf7c1d08868846aa765f357e9f0b3aef4.tar.gz pfsense-packages-56c7473bf7c1d08868846aa765f357e9f0b3aef4.tar.bz2 pfsense-packages-56c7473bf7c1d08868846aa765f357e9f0b3aef4.zip | |
Use unique function names for these package functions rather than the same name, to avoid name collisions if someone has both installed.
Diffstat (limited to 'config/cron')
| -rw-r--r-- | config/cron/cron.inc | 10 | ||||
| -rw-r--r-- | config/cron/cron.xml | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/config/cron/cron.inc b/config/cron/cron.inc index ea490b3a..3e6b6cea 100644 --- a/config/cron/cron.inc +++ b/config/cron/cron.inc @@ -33,7 +33,7 @@ require_once("services.inc"); -function pkg_is_service_running($servicename) +function pkg_is_service_running($servicename) { exec("/bin/ps ax | awk '{ print $5 }'", $psout); array_shift($psout); @@ -48,7 +48,7 @@ function pkg_is_service_running($servicename) } } -function php_sync_package() +function cron_sync_package() { global $config; @@ -62,7 +62,7 @@ function php_sync_package() } -function php_install_command() +function cron_install_command() { global $config; @@ -93,7 +93,7 @@ function php_install_command() ) ); - php_sync_package(); + cron_sync_package(); //if (pkg_is_service_running('cron')) { //documentation purposes @@ -105,7 +105,7 @@ function php_install_command() } -function deinstall_command() +function cron_deinstall_command() { conf_mount_rw(); config_lock(); diff --git a/config/cron/cron.xml b/config/cron/cron.xml index cbffdeec..9858df8c 100644 --- a/config/cron/cron.xml +++ b/config/cron/cron.xml @@ -107,15 +107,15 @@ <custom_add_php_command> </custom_add_php_command> <custom_php_resync_config_command> - php_sync_package(); + cron_sync_package(); </custom_php_resync_config_command> <custom_delete_php_command> - php_sync_package(); + cron_sync_package(); </custom_delete_php_command> <custom_php_install_command> - php_install_command(); + cron_install_command(); </custom_php_install_command> <custom_php_deinstall_command> - deinstall_command(); + cron_deinstall_command(); </custom_php_deinstall_command> </packagegui>
\ No newline at end of file |