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/backup | |
| 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/backup')
| -rw-r--r-- | config/backup/backup.inc | 8 | ||||
| -rw-r--r-- | config/backup/backup.xml | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/config/backup/backup.inc b/config/backup/backup.inc index 13c62f26..b10fceb8 100644 --- a/config/backup/backup.inc +++ b/config/backup/backup.inc @@ -65,14 +65,14 @@ function backup_sync_package_php() } -function php_sync_package() +function backup_sync_package() { global $config; backup_sync_package_php(); } -function php_install_command() +function backup_install_command() { global $config; @@ -98,14 +98,14 @@ function php_install_command() exec("cp /tmp/backup_edit.tmp /usr/local/www/packages/backup/backup_edit.php"); unlink_if_exists("/tmp/backup_edit.tmp"); - php_sync_package(); + backup_sync_package(); conf_mount_ro(); } -function deinstall_command() +function backup_deinstall_command() { conf_mount_rw(); unlink_if_exists("/usr/local/pkg/backup.xml"); diff --git a/config/backup/backup.xml b/config/backup/backup.xml index b48a8e28..8f26e3de 100644 --- a/config/backup/backup.xml +++ b/config/backup/backup.xml @@ -101,15 +101,15 @@ <custom_add_php_command> </custom_add_php_command> <custom_php_resync_config_command> - php_sync_package(); + backup_sync_package(); </custom_php_resync_config_command> <custom_delete_php_command> - php_sync_package(); + backup_sync_package(); </custom_delete_php_command> <custom_php_install_command> - php_install_command(); + backup_install_command(); </custom_php_install_command> <custom_php_deinstall_command> - deinstall_command(); + backup_deinstall_command(); </custom_php_deinstall_command> </packagegui>
\ No newline at end of file |