aboutsummaryrefslogtreecommitdiffstats
path: root/config/avahi
diff options
context:
space:
mode:
authordoktornotor <notordoktor@gmail.com>2015-08-25 08:46:22 +0200
committerdoktornotor <notordoktor@gmail.com>2015-08-25 08:46:22 +0200
commit4e25dce24f823641e44938d0ab0ddb6ed5a1afb5 (patch)
tree053b58cfb44d3190b66ae2bd1b9afea687b2def9 /config/avahi
parentea5a2a7170f2c18372eb2d3b98a87822a24c0acd (diff)
downloadpfsense-packages-4e25dce24f823641e44938d0ab0ddb6ed5a1afb5.tar.gz
pfsense-packages-4e25dce24f823641e44938d0ab0ddb6ed5a1afb5.tar.bz2
pfsense-packages-4e25dce24f823641e44938d0ab0ddb6ed5a1afb5.zip
Remove useless remount calls and other redundant stuff
These are dealt with by install_package(), uninstall_package() and delete_package_xml() from pkg-utils.inc.
Diffstat (limited to 'config/avahi')
-rw-r--r--config/avahi/avahi.inc17
1 files changed, 1 insertions, 16 deletions
diff --git a/config/avahi/avahi.inc b/config/avahi/avahi.inc
index 7d69af78..4c824e71 100644
--- a/config/avahi/avahi.inc
+++ b/config/avahi/avahi.inc
@@ -36,8 +36,6 @@ if ($pfs_version == "2.1" || $pfs_version == "2.2") {
}
function avahi_install() {
- conf_mount_rw();
-
if (!file_exists('/usr/local/etc/gnome.subr')) {
@symlink(AVAHI_BASE . '/etc/gnome.subr', '/usr/local/etc/gnome.subr');
}
@@ -49,21 +47,10 @@ function avahi_install() {
if (!exec("/usr/sbin/pw groupshow avahi")) {
exec("/usr/sbin/pw groupadd avahi -g 558");
}
-
- conf_mount_ro();
}
function avahi_deinstall() {
- conf_mount_rw();
-
- // Stop services and remove created rc script and symlink
- if (is_process_running("avahi-daemon")) {
- exec("/usr/bin/killall -9 avahi-daemon");
- }
- if (is_process_running("dbus-daemon")) {
- exec("/usr/bin/killall -9 dbus-daemon");
- }
- unlink_if_exists("/usr/local/etc/rc.d/avahi-daemon.sh");
+ // Remove created symlink
unlink_if_exists("/usr/local/etc/gnome.subr");
// Remove created users and groups if they exist
@@ -73,8 +60,6 @@ function avahi_deinstall() {
if (exec("/usr/sbin/pw usershow avahi")) {
exec("/usr/sbin/pw userdel avahi");
}
-
- conf_mount_ro();
}
function avahi_write_config() {