diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-10-08 18:35:25 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-10-08 18:35:25 -0300 |
| commit | ece92ce7276928ac027138395023963e5d821940 (patch) | |
| tree | e2ab90462e606beb64b64ee422bb3a90540eb3df | |
| parent | 4b281686f5457caa8eac914b6d4f75862f273779 (diff) | |
| download | pfsense-packages-ece92ce7276928ac027138395023963e5d821940.tar.gz pfsense-packages-ece92ce7276928ac027138395023963e5d821940.tar.bz2 pfsense-packages-ece92ce7276928ac027138395023963e5d821940.zip | |
2nd attempt to fix avahi on 2.2
| -rw-r--r-- | config/avahi/avahi.inc | 16 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/config/avahi/avahi.inc b/config/avahi/avahi.inc index e2cb7b6e..a22d94c0 100644 --- a/config/avahi/avahi.inc +++ b/config/avahi/avahi.inc @@ -54,7 +54,7 @@ function avahi_stop() { } function avahi_install() { - global $g, $config; + global $g, $config, $pfs_version; conf_mount_rw(); // This old hacky install code should only happen on 1.x @@ -73,6 +73,10 @@ function avahi_install() { } } + if ($pfs_version >= 2.2 && !file_exists('/usr/local/etc/gnome.subr')) { + @symlink(AVAHI_LOCALBASE . '/etc/gnome.subr', '/usr/local/etc/gnome.subr'); + } + // Add needed users and groups exec("/usr/sbin/pw useradd avahi -u 558"); exec("/usr/sbin/pw groupadd avahi -g 558"); @@ -174,20 +178,20 @@ EOF; $start .= " mkdir -p /proc\n"; $start .= " mount -t procfs procfs /proc\n"; $start .= "fi\n"; - $start .= "/usr/bin/killall avahi-daemon\n"; + $start .= "/usr/bin/killall avahi-daemon >/dev/null 2>&1\n"; if (file_exists(AVAHI_LOCALBASE . "/etc/rc.d/dbus")) { - $start .= "/usr/bin/killall dbus-daemon\n"; - $start .= "rm /var/run/dbus/dbus.pid\n"; + $start .= AVAHI_LOCALBASE . "/etc/rc.d/dbus onestop\n"; + $start .= "rm /var/run/dbus/dbus.pid >/dev/null 2>&1\n"; $start .= AVAHI_LOCALBASE . "/etc/rc.d/dbus onestart\n"; } $start .= "sleep 5\n"; $start .= AVAHI_BASE . "/sbin/avahi-daemon -D\n"; $start .= "/etc/rc.conf_mount_ro\n"; - $stop = "/usr/bin/killall avahi-daemon\n"; + $stop = "/usr/bin/killall avahi-daemon >/dev/null 2>&1\n"; if (file_exists(AVAHI_LOCALBASE . "/etc/rc.d/dbus")) { $stop .= AVAHI_LOCALBASE . "/etc/rc.d/dbus onestop\n"; - $stop .= "rm /var/run/dbus/dbus.pid\n"; + $stop .= "rm /var/run/dbus/dbus.pid >/dev/null 2>&1\n"; } write_rcfile(array( diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 654187aa..f21936a7 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -196,7 +196,7 @@ <build_options>avahi_UNSET_FORCE=GTK;cairo_UNSET_FORCE=X11 XCB</build_options> <build_pbi> <port>net/avahi</port> - <ports_after>devel/dbus</ports_after> + <ports_after>net/avahi-app devel/dbus</ports_after> </build_pbi> <depends_on_package_pbi>avahi-0.6.31-##ARCH##.pbi</depends_on_package_pbi> <version>0.6.31 pkg v1.05</version> |