FreeBSD Bugzilla – Attachment 189456 Details for
Bug 224844
sysutils/zrepl initscript broken for FreeBSD 10.3
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to fix sysutils/zrepl init script on FreeBSD version < 11.1-RELEASE
zrepl.diff (text/plain), 3.10 KB, created by
Ben Woods
on 2018-01-06 06:45:12 UTC
(
hide
)
Description:
Patch to fix sysutils/zrepl init script on FreeBSD version < 11.1-RELEASE
Filename:
MIME Type:
Creator:
Ben Woods
Created:
2018-01-06 06:45:12 UTC
Size:
3.10 KB
patch
obsolete
>Index: sysutils/zrepl/Makefile >=================================================================== >--- sysutils/zrepl/Makefile (revision 458188) >+++ sysutils/zrepl/Makefile (working copy) >@@ -3,6 +3,7 @@ > > PORTNAME= zrepl > PORTVERSION= 0.0.2 >+PORTREVISION= 1 > CATEGORIES= sysutils > > MAINTAINER= woodsb02@FreeBSD.org >@@ -35,6 +36,14 @@ > > GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} > >+.include <bsd.port.pre.mk> >+ >+.if ${OPSYS} == "FreeBSD" && ((${OSVERSION} >= 1100513 && ${OSVERSION} < 1200000) || ${OSVERSION} >= 1200015) >+SUB_LIST+= DAEMON_LOGGING="-S -l \$${zrepl_facility} -s \$${zrepl_priority} -T \$${name}" >+.else >+SUB_LIST+= DAEMON_LOGGING="" >+.endif >+ > post-extract: > ${LN} -sf ${WRKSRC}/src ${WRKDIR} > >@@ -49,4 +58,4 @@ > ${INSTALL_DATA} ${FILESDIR}/syslog-zrepl.conf.sample ${STAGEDIR}${PREFIX}/etc/syslog.d/zrepl.conf.sample > ${INSTALL_DATA} ${FILESDIR}/zrepl.yml.sample ${STAGEDIR}${PREFIX}/etc/zrepl/zrepl.yml.sample > >-.include <bsd.port.mk> >+.include <bsd.port.post.mk> >Index: sysutils/zrepl/files/zrepl.in >=================================================================== >--- sysutils/zrepl/files/zrepl.in (revision 458188) >+++ sysutils/zrepl/files/zrepl.in (working copy) >@@ -9,18 +9,24 @@ > # Add the following lines to /etc/rc.conf.local or /etc/rc.conf > # to enable this service: > # >-# zrepl_enable: Set to YES to enable the zrepl service. >+# zrepl_enable (bool): Set to YES to enable the zrepl service. > # Default: NO >-# zrepl_config: File containing zrepl configuration details. >+# zrepl_config (str): File containing zrepl configuration details. > # Default: %%PREFIX%%/etc/zrepl/zrepl.yml >-# zrepl_user: The user account used to run the zrepl daemon. >+# zrepl_user (str): The user account used to run the zrepl daemon. > # Do not specifically set this to an empty string as this > # will cause the daemon to run as root. > # Default: root >-# zrepl_group: The group account used to run the zrepl daemon. >+# zrepl_group (str): The group account used to run the zrepl daemon. > # Do not specifically set this to an empty string as this > # will cause the daemon to run with group wheel. > # Default: wheel >+# zrepl_flags (str): Extra flags passed to zrepl >+# Default: "" >+# zrepl_facility (str): Syslog facility to use >+# Default: local0 >+# zrepl_priority (str): Syslog priority to use >+# Default: alert > > . /etc/rc.subr > name=zrepl >@@ -31,13 +37,19 @@ > : ${zrepl_config:="%%PREFIX%%/etc/zrepl/zrepl.yml"} > : ${zrepl_user:="root"} > : ${zrepl_group:="wheel"} >+: ${zrepl_flags:=""} >+: ${zrepl_facility:="local0"} >+: ${zrepl_priority:="alert"} >+: ${zrepl_options:="${zrepl_flags} --config ${zrepl_config} daemon"} > > pidfile="/var/run/zrepl/daemon.pid" > command="/usr/sbin/daemon" > procname="%%PREFIX%%/bin/zrepl" >-command_args="-p ${pidfile} -S -l local0 -s alert -T zrepl ${procname} --config ${zrepl_config} daemon" >+command_args="-p ${pidfile} %%DAEMON_LOGGING%% ${procname} ${zrepl_options}" > > start_precmd=zrepl_precmd >+stop_postcmd=zrepl_postcmd >+ > zrepl_precmd() > { > if [ ! -d "/var/run/zrepl/stdinserver" ]; then >@@ -50,7 +62,6 @@ > fi > } > >-stop_postcmd=zrepl_postcmd > zrepl_postcmd() > { > rm -f -- "${pidfile}"
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
woodsb02
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 224844
: 189456