init.d.examples: pid files always go in /var
This removes the @VARBASE@ substitution since it is always translated to /var.
This commit is contained in:
		| @@ -7,7 +7,5 @@ BIN=	${OBJS} | ||||
|  | ||||
| MK=	../../mk | ||||
|  | ||||
| SED_EXTRA+= -e 's:@VARBASE@:/var:g' | ||||
|  | ||||
| include ${MK}/os.mk | ||||
| include ${MK}/scripts.mk | ||||
|   | ||||
| @@ -11,7 +11,7 @@ | ||||
|  | ||||
| command=@PKG_PREFIX@/sbin/avahi-dnsconfd | ||||
| command_args="$avahi_dnsconfd_args -D" | ||||
| pidfile=@VARBASE@/run/avahi-dnsconfd.pid | ||||
| pidfile=/var/run/avahi-dnsconfd.pid | ||||
| name="Avahi DNS Configuration Daemon" | ||||
|  | ||||
| depend() | ||||
|   | ||||
| @@ -11,7 +11,7 @@ | ||||
|  | ||||
| command=@PKG_PREFIX@/sbin/avahi-daemon | ||||
| command_args="$avahid_args -D" | ||||
| pidfile=@VARBASE@/run/avahi-daemon/pid | ||||
| pidfile=/var/run/avahi-daemon/pid | ||||
| name="Avahi Service Advertisement Daemon" | ||||
|  | ||||
| depend() | ||||
|   | ||||
| @@ -10,7 +10,7 @@ | ||||
| # except according to the terms contained in the LICENSE file. | ||||
|  | ||||
| command=@PKG_PREFIX@/bin/dbus-daemon | ||||
| pidfile=@VARBASE@/run/dbus/pid | ||||
| pidfile=/var/run/dbus/pid | ||||
| command_args="${dbusd_args---system}" | ||||
| name="Message Bus Daemon" | ||||
|  | ||||
|   | ||||
| @@ -11,7 +11,7 @@ | ||||
|  | ||||
| command=@PKG_PREFIX@/sbin/dnsmasq | ||||
| command_args=$dnsmasq_args | ||||
| pidfile=@VARBASE@/run/dnsmasq.pid | ||||
| pidfile=/var/run/dnsmasq.pid | ||||
| required_files=/etc/dnsmasq.conf | ||||
|  | ||||
| extra_started_commands="reload" | ||||
|   | ||||
| @@ -10,7 +10,7 @@ | ||||
| # except according to the terms contained in the LICENSE file. | ||||
|  | ||||
| command=@PKG_PREFIX@/sbin/hald | ||||
| pidfile=@VARBASE@/run/hald/hald.pid | ||||
| pidfile=/var/run/hald/hald.pid | ||||
| command_args=$hald_args | ||||
| name="Hardware Abstraction Layer Daemon" | ||||
|  | ||||
|   | ||||
| @@ -11,7 +11,7 @@ | ||||
|  | ||||
| command=/usr/sbin/named | ||||
| command_args=$named_args | ||||
| pidfile=@VARBASE@/run/named.pid | ||||
| pidfile=/var/run/named.pid | ||||
| name="Domain Name server" | ||||
| extra_started_commands="reload" | ||||
|  | ||||
| @@ -20,7 +20,7 @@ uid=named | ||||
| case "$RC_UNAME" in | ||||
| 	FreeBSD) | ||||
| 		uid=bind | ||||
| 		pidfile=@VARBASE@/run/named/pid | ||||
| 		pidfile=/var/run/named/pid | ||||
| 		;; | ||||
| 	Linux) | ||||
| 		uid=bind | ||||
|   | ||||
| @@ -14,7 +14,7 @@ name="OpenVPN" | ||||
| [ "$vpn" != openvpn ] && name="$name ($vpn)" | ||||
| command=@PKG_PREFIX@/sbin/openvpn | ||||
|  | ||||
| pidfile=@VARBASE@/run/"$RC_SVCNAME".pid | ||||
| pidfile=/var/run/"$RC_SVCNAME".pid | ||||
| : ${openvpn_dir:=@PKG_PREFIX@/etc/openvpn} | ||||
| : ${openvpn_config:=$openvpn_dir/$vpn.conf} | ||||
| command_args="$openvpn_args --daemon --config $openvpn_config" | ||||
|   | ||||
| @@ -10,7 +10,7 @@ | ||||
| # except according to the terms contained in the LICENSE file. | ||||
|  | ||||
| command=@PKG_PREFIX@/sbin/polkitd | ||||
| pidfile=@VARBASE@/run/polkitd/polkitd.pid | ||||
| pidfile=/var/run/polkitd/polkitd.pid | ||||
| command_args="$polkitd_args" | ||||
| name="PolicyKit Daemon" | ||||
|  | ||||
|   | ||||
| @@ -11,7 +11,7 @@ | ||||
|  | ||||
| command=/usr/sbin/sshd | ||||
| command_args=$sshd_args | ||||
| pidfile=@VARBASE@/run/sshd.pid | ||||
| pidfile=/var/run/sshd.pid | ||||
| required_files=/etc/ssh/sshd_config | ||||
|  | ||||
| depend() | ||||
|   | ||||
		Reference in New Issue
	
	Block a user