diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2015-07-15 13:50:55 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2015-07-15 13:50:55 +0000 |
| commit | a178b972044009443826961af2dd52b492a45949 (patch) | |
| tree | a9c4fa2baa1a653cd0f37b0af203cc244482e48d | |
| parent | ff1df6f11db03853f6e4b77297aeaf53e6d2ad83 (diff) | |
Fix base rc.d scripts after the recent rc.subr change.
ok halex@
| -rw-r--r-- | etc/rc.d/amd | 3 | ||||
| -rw-r--r-- | etc/rc.d/spamd | 4 | ||||
| -rw-r--r-- | etc/rc.d/sshd | 4 | ||||
| -rw-r--r-- | etc/rc.d/tftpproxy | 3 | ||||
| -rw-r--r-- | etc/rc.d/ypldap | 4 |
5 files changed, 10 insertions, 8 deletions
diff --git a/etc/rc.d/amd b/etc/rc.d/amd index b6b822306c8..f31c783318f 100644 --- a/etc/rc.d/amd +++ b/etc/rc.d/amd @@ -1,11 +1,12 @@ #!/bin/sh # -# $OpenBSD: amd,v 1.6 2013/09/01 15:02:35 ajacoutot Exp $ +# $OpenBSD: amd,v 1.7 2015/07/15 13:50:54 ajacoutot Exp $ daemon="/usr/sbin/amd" . /etc/rc.d/rc.subr +pexp="${daemon}.*" rc_reload=NO rc_stop=NO diff --git a/etc/rc.d/spamd b/etc/rc.d/spamd index cbdb4cc0c58..87003ce88fb 100644 --- a/etc/rc.d/spamd +++ b/etc/rc.d/spamd @@ -1,12 +1,12 @@ #!/bin/sh # -# $OpenBSD: spamd,v 1.6 2014/07/20 08:37:07 rpe Exp $ +# $OpenBSD: spamd,v 1.7 2015/07/15 13:50:54 ajacoutot Exp $ daemon="/usr/libexec/spamd" . /etc/rc.d/rc.subr -pexp="spamd: \[priv\]" +pexp="spamd: \[priv\].*" rc_reload=NO rc_pre() { diff --git a/etc/rc.d/sshd b/etc/rc.d/sshd index dc3d58d506a..8ea6f579313 100644 --- a/etc/rc.d/sshd +++ b/etc/rc.d/sshd @@ -1,13 +1,13 @@ #!/bin/sh # -# $OpenBSD: sshd,v 1.2 2013/02/05 00:26:31 halex Exp $ +# $OpenBSD: sshd,v 1.3 2015/07/15 13:50:54 ajacoutot Exp $ daemon="/usr/sbin/sshd" . /etc/rc.d/rc.subr rc_reload() { - ${daemon} ${daemon_flags} -t && pkill -HUP -f "^${pexp}" + ${daemon} ${daemon_flags} -t && pkill -HUP -xf "${pexp}" } rc_cmd $1 diff --git a/etc/rc.d/tftpproxy b/etc/rc.d/tftpproxy index ad661474dea..0b94ff56920 100644 --- a/etc/rc.d/tftpproxy +++ b/etc/rc.d/tftpproxy @@ -1,11 +1,12 @@ #!/bin/sh # -# $OpenBSD: tftpproxy,v 1.1 2012/08/20 12:37:53 dlg Exp $ +# $OpenBSD: tftpproxy,v 1.2 2015/07/15 13:50:54 ajacoutot Exp $ daemon="/usr/sbin/tftp-proxy" . /etc/rc.d/rc.subr +pexp="tftp-proxy: privproc" rc_reload=NO rc_cmd $1 diff --git a/etc/rc.d/ypldap b/etc/rc.d/ypldap index 98a51d6254a..3dad9d1026a 100644 --- a/etc/rc.d/ypldap +++ b/etc/rc.d/ypldap @@ -1,11 +1,11 @@ #!/bin/sh # -# $OpenBSD: ypldap,v 1.2 2011/10/13 07:54:06 ajacoutot Exp $ +# $OpenBSD: ypldap,v 1.3 2015/07/15 13:50:54 ajacoutot Exp $ daemon="/usr/sbin/ypldap" . /etc/rc.d/rc.subr -pexp="ypldap: ldap client" +pexp="ypldap: ldap client.*" rc_cmd $1 |