aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2014-11-26 14:42:10 -0200
committerRenato Botelho <garga@FreeBSD.org>2014-11-26 14:42:10 -0200
commitd34a474a6ca40be79b5ea0a97db2b55c1ea709cc (patch)
tree9379808a20874a3ac98b00a0727aec3cd775e294 /config
parenta8e2d240322fc3e4cebf9a864399d2187da52053 (diff)
downloadpfsense-packages-d34a474a6ca40be79b5ea0a97db2b55c1ea709cc.tar.gz
pfsense-packages-d34a474a6ca40be79b5ea0a97db2b55c1ea709cc.tar.bz2
pfsense-packages-d34a474a6ca40be79b5ea0a97db2b55c1ea709cc.zip
We don't want to call rc.d direct from local subdir, use the wrapper
Diffstat (limited to 'config')
-rw-r--r--config/avahi/avahi.inc26
1 files changed, 10 insertions, 16 deletions
diff --git a/config/avahi/avahi.inc b/config/avahi/avahi.inc
index a22d94c0..ecef6f33 100644
--- a/config/avahi/avahi.inc
+++ b/config/avahi/avahi.inc
@@ -34,15 +34,9 @@ switch ($pfs_version) {
case "1.2":
case "2.0":
define('AVAHI_BASE', '/usr/local');
- define('AVAHI_LOCALBASE', AVAHI_BASE);
- break;
- case "2.1":
- define('AVAHI_BASE', '/usr/pbi/avahi-' . php_uname("m"));
- define('AVAHI_LOCALBASE', AVAHI_BASE);
break;
default:
define('AVAHI_BASE', '/usr/pbi/avahi-' . php_uname("m"));
- define('AVAHI_LOCALBASE', AVAHI_BASE . '/local');
}
function avahi_start() {
@@ -62,8 +56,8 @@ function avahi_install() {
$archive = (substr(trim(file_get_contents("/etc/version")),0,1) == "1") ? "avahi.tar.gz" : "";
// Extract out libraries and avahi-daemon
if(!empty($archive) && file_exists("/root/{$archive}")) {
- exec("mkdir -p " . AVAHI_LOCALBASE . "/etc/avahi/services/");
- exec("mv " . AVAHI_LOCALBASE . "/etc/avahi/*.service " . AVAHI_LOCALBASE . "/etc/avahi/services/");
+ exec("mkdir -p " . AVAHI_BASE . "/etc/avahi/services/");
+ exec("mv " . AVAHI_BASE . "/etc/avahi/*.service " . AVAHI_BASE . "/etc/avahi/services/");
exec("/usr/bin/tar xzPUf /root/{$archive} -C /");
unlink("/root/{$archive}");
// Make sure everthing was extracted
@@ -74,7 +68,7 @@ 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');
+ @symlink(AVAHI_BASE . '/etc/gnome.subr', '/usr/local/etc/gnome.subr');
}
// Add needed users and groups
@@ -168,8 +162,8 @@ rlimit-nproc=3
EOF;
/* Write out .conf file */
- safe_mkdir(AVAHI_LOCALBASE . "/etc/avahi");
- $fd = fopen(AVAHI_LOCALBASE . "/etc/avahi/avahi-daemon.conf", "w");
+ safe_mkdir(AVAHI_BASE . "/etc/avahi");
+ $fd = fopen(AVAHI_BASE . "/etc/avahi/avahi-daemon.conf", "w");
fwrite($fd, $avahiconfig);
fclose($fd);
/* Write out rc.d startup file */
@@ -179,18 +173,18 @@ EOF;
$start .= " mount -t procfs procfs /proc\n";
$start .= "fi\n";
$start .= "/usr/bin/killall avahi-daemon >/dev/null 2>&1\n";
- if (file_exists(AVAHI_LOCALBASE . "/etc/rc.d/dbus")) {
- $start .= AVAHI_LOCALBASE . "/etc/rc.d/dbus onestop\n";
+ if (file_exists(AVAHI_BASE . "/etc/rc.d/dbus")) {
+ $start .= AVAHI_BASE . "/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 .= AVAHI_BASE . "/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 >/dev/null 2>&1\n";
- if (file_exists(AVAHI_LOCALBASE . "/etc/rc.d/dbus")) {
- $stop .= AVAHI_LOCALBASE . "/etc/rc.d/dbus onestop\n";
+ if (file_exists(AVAHI_BASE . "/etc/rc.d/dbus")) {
+ $stop .= AVAHI_BASE . "/etc/rc.d/dbus onestop\n";
$stop .= "rm /var/run/dbus/dbus.pid >/dev/null 2>&1\n";
}