aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Stefan Haischt <dsh@pfsense.org>2006-08-17 05:58:52 +0000
committerDaniel Stefan Haischt <dsh@pfsense.org>2006-08-17 05:58:52 +0000
commitb9606b3f5705f44545d410dc33f9f38c8e03a153 (patch)
tree1aea1ee0f6ca18b44905219b2a57591c96158572
parented814850398b9c680c82060767b28c86559f24ae (diff)
downloadpfsense-packages-b9606b3f5705f44545d410dc33f9f38c8e03a153.tar.gz
pfsense-packages-b9606b3f5705f44545d410dc33f9f38c8e03a153.tar.bz2
pfsense-packages-b9606b3f5705f44545d410dc33f9f38c8e03a153.zip
cleanup config on deinstall
-rw-r--r--packages/freenas/pkg/freenas.inc6
-rw-r--r--packages/freenas/www/services_afp.php2
-rw-r--r--packages/freenas/www/services_ftp.php2
-rw-r--r--packages/freenas/www/services_rsyncd.php2
-rw-r--r--packages/freenas/www/services_samba.php2
5 files changed, 10 insertions, 4 deletions
diff --git a/packages/freenas/pkg/freenas.inc b/packages/freenas/pkg/freenas.inc
index c77abcfc..594c0412 100644
--- a/packages/freenas/pkg/freenas.inc
+++ b/packages/freenas/pkg/freenas.inc
@@ -211,6 +211,8 @@ function custom_php_install_command() {
}
function custom_php_deinstall_command() {
+ global $config;
+
oninstall_copy_kernel_binaries("deinstall");
oninstall_copy_misc_binaries("deinstall");
@@ -219,4 +221,8 @@ function custom_php_deinstall_command() {
unlink_if_exists("/usr/local/etc/uams/uams_clrtxt.so");
unlink_if_exists("/usr/local/etc/uams/uams_dhx.so");
+
+ unset($config['installedpackages']['freenas']);
+ write_config();
+ conf_mount_ro();
?>
diff --git a/packages/freenas/www/services_afp.php b/packages/freenas/www/services_afp.php
index deee46f0..64817c1a 100644
--- a/packages/freenas/www/services_afp.php
+++ b/packages/freenas/www/services_afp.php
@@ -102,7 +102,7 @@ if (! empty($_POST))
/* nuke the cache file */
config_lock();
services_afpd_configure();
- services_mdnsresponder_configure();
+ services_zeroconf_configure();
config_unlock();
}
diff --git a/packages/freenas/www/services_ftp.php b/packages/freenas/www/services_ftp.php
index 3da55786..88683e57 100644
--- a/packages/freenas/www/services_ftp.php
+++ b/packages/freenas/www/services_ftp.php
@@ -166,7 +166,7 @@ if (! empty($_POST))
/* nuke the cache file */
config_lock();
services_ftpd_configure();
- services_mdnsresponder_configure();
+ services_zeroconf_configure();
config_unlock();
}
$savemsg = get_std_save_message($retval);
diff --git a/packages/freenas/www/services_rsyncd.php b/packages/freenas/www/services_rsyncd.php
index e4b744b7..ea85202d 100644
--- a/packages/freenas/www/services_rsyncd.php
+++ b/packages/freenas/www/services_rsyncd.php
@@ -115,7 +115,7 @@ if (! empty($_POST))
/* nuke the cache file */
config_lock();
services_rsyncd_configure();
- services_mdnsresponder_configure();
+ services_zeroconf_configure();
config_unlock();
}
$savemsg = get_std_save_message($retval);
diff --git a/packages/freenas/www/services_samba.php b/packages/freenas/www/services_samba.php
index 9486f8fc..f6c0f58b 100644
--- a/packages/freenas/www/services_samba.php
+++ b/packages/freenas/www/services_samba.php
@@ -142,7 +142,7 @@ if (! empty($_POST))
/* nuke the cache file */
config_lock();
services_samba_configure();
- services_mdnsresponder_configure();
+ services_zeroconf_configure();
config_unlock();
}
$savemsg = get_std_save_message($retval);