diff options
| -rw-r--r-- | net-misc/ser2net/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/ser2net/Manifest | 6 | ||||
| -rw-r--r-- | net-misc/ser2net/files/ser2net.confd | 4 | ||||
| -rw-r--r-- | net-misc/ser2net/files/ser2net.initd | 50 |
4 files changed, 43 insertions, 23 deletions
diff --git a/net-misc/ser2net/ChangeLog b/net-misc/ser2net/ChangeLog index 19bbc96222dc..9c07dcd04abf 100644 --- a/net-misc/ser2net/ChangeLog +++ b/net-misc/ser2net/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/ser2net # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ser2net/ChangeLog,v 1.18 2008/09/02 18:02:27 sbriesen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ser2net/ChangeLog,v 1.19 2008/09/03 19:21:59 sbriesen Exp $ + + 03 Sep 2008; Stefan Briesenick <sbriesen@gentoo.org> files/ser2net.confd, + files/ser2net.initd: + reworked init-script. *ser2net-2.5 (02 Sep 2008) diff --git a/net-misc/ser2net/Manifest b/net-misc/ser2net/Manifest index c7c171c96cd0..334bb75532e1 100644 --- a/net-misc/ser2net/Manifest +++ b/net-misc/ser2net/Manifest @@ -1,8 +1,8 @@ -AUX ser2net.confd 782 RMD160 5935e8cf02813f9cb6a2b837eb120d330fc99aec SHA1 9682f7844cb4988c9d9614feb7862703a73e7f42 SHA256 a56840d58d852d90d54edbed61eee8e4a19d9d240c7527627e46d2564f9ff745 -AUX ser2net.initd 1348 RMD160 de29a38654d9b6f8780a01869c63403ec59474e5 SHA1 070bcc461e3ea288bca2a195133ad894c243b1d4 SHA256 9dc3844f8d3a8db22463bea23c3cd99d90f23c9fd03e178a79f55b49d6283fc4 +AUX ser2net.confd 879 RMD160 38a0875576afac8035d74f1a5ef5c1eb74d8662b SHA1 d4dd5cc74456b012af3c37e4169b2a99fe9a6a56 SHA256 3058368970e77b8b7fcf6fca9f3530b683d9e9c27c431531f8566dde01dab849 +AUX ser2net.initd 1575 RMD160 2e73b96cdb200ca3becb264e7f068b54eb0925c8 SHA1 dd6033edabc368bf8f1698dba18d6ff3906b1773 SHA256 34fec003763c0ec43efb5090121f4b7a2022ac4c397a18c161876d294e9b6c1f DIST ser2net-2.3.tar.gz 303997 RMD160 60d32c572fef2cf7c3c540425d26d7429c8eeb85 SHA1 6326efe6af2a13a248bdaa55fc31e5c0f2422682 SHA256 2b5dfdd457f31bd2eec9afc8ed2873bd40b2d6f3cb9ff7275dd9384218b01734 DIST ser2net-2.5.tar.gz 343105 RMD160 4856b0b6c7e7ae31ea8105c19ab14844768e7f40 SHA1 8da41448e0a1f5a1e803283380b48323bebf3286 SHA256 fb7bf30c967b4d64f12e6d81f99df3d3e65bb31a919625ec2820e68f65dcef1c EBUILD ser2net-2.3.ebuild 841 RMD160 f5b3d5853de95eac2061ff92f103b4fa8d6b2525 SHA1 fd19a854b410dc117c3d0eea7b69a423b4a3521d SHA256 bd14023c61644bdca74e4163e14af9b60713822caef6f5c25e5aefd6884bacdd EBUILD ser2net-2.5.ebuild 958 RMD160 bb38af420ea0f259cdb5e7d933aa8be00c00e964 SHA1 3d9a64aa79b9b2694bb7b6739d42b766a834a5da SHA256 dbeeb6d949fefadf8cce227dd863e006e8fb4f5c5b13cd02fc44aab71132145f -MISC ChangeLog 2736 RMD160 910c543a95b38e7951db71a0080258919e2bf396 SHA1 af48b3cb75b67baebe9646fbb46381573ca0a7d3 SHA256 7642ca4d75047a11752e6444e89e820c500eeb0893a4a0b8876d8a425dd12855 +MISC ChangeLog 2860 RMD160 bb8ca464abe80750fe5299ab514d281b8211d07e SHA1 220c292c97b2bec7b8a164f704a14aeb24db345a SHA256 8224eecc1b7401f09528ef6d290bfc448112a9d386e9e9c06228d84dd348541f MISC metadata.xml 257 RMD160 7716423decf8296528ca21eaa830fac2816fa991 SHA1 01e7fba79bf45ff5ed3b3b12d421a7b8c084142b SHA256 9b843be0ba934a7342d5c3a52eb98e022e171baab73193f3dc8f3d86fe23b1ef diff --git a/net-misc/ser2net/files/ser2net.confd b/net-misc/ser2net/files/ser2net.confd index 7d9c536f4376..c66685159348 100644 --- a/net-misc/ser2net/files/ser2net.confd +++ b/net-misc/ser2net/files/ser2net.confd @@ -21,3 +21,7 @@ # #UUCP_LOCKS="no" +# see the ser2net(8) manual page for additional options you can configure here +# +#EXTRA_OPTS="" + diff --git a/net-misc/ser2net/files/ser2net.initd b/net-misc/ser2net/files/ser2net.initd index 7ba1b0a85830..31b4ab96cde4 100644 --- a/net-misc/ser2net/files/ser2net.initd +++ b/net-misc/ser2net/files/ser2net.initd @@ -1,41 +1,53 @@ #!/sbin/runscript # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ser2net/files/ser2net.initd,v 1.1 2008/09/02 18:02:28 sbriesen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ser2net/files/ser2net.initd,v 1.2 2008/09/03 19:22:00 sbriesen Exp $ + +description="Serial to network proxy (${RC_SVCNAME})" +description_reload="Reread configuration file and make the appropriate changes" +extra_started_commands="reload" +command="/usr/sbin/ser2net" +pidfile="/var/run/${RC_SVCNAME}.pid" depend() { + use logger need net - after bootmisc } config_check() { - SER2NET_OPTS="" + command_args="${EXTRA_OPTS}" CONFIG_FILE_DEFAULT="/etc/ser2net.conf" - yesno "${CISCO_IOS:-no}" && SER2NET_OPTS="${SER2NET_OPTS} -b" - yesno "${UUCP_LOCKS:-yes}" || SER2NET_OPTS="${SER2NET_OPTS} -u" + yesno "${CISCO_IOS:-no}" && command_args="${SER2NET_OPTS} -b" + yesno "${UUCP_LOCKS:-yes}" || command_args="${command_args} -u" [ -z "${CONFIG_FILE}" ] && CONFIG_FILE="${CONFIG_FILE_DEFAULT}" - [ -n "${CONTROL_PORT}" ] && SER2NET_OPTS="${SER2NET_OPTS} -p ${CONTROL_PORT}" - [ "${CONFIG_FILE}" != "${CONFIG_FILE_DEFAULT}" ] && SER2NET_OPTS="${SER2NET_OPTS} -c ${CONFIG_FILE}" - - if [ ! -f "${CONFIG_FILE}" ]; then - eerror "Please create ${CONFIG_FILE}" - eerror "Sample conf: ${CONFIG_FILE_DEFAULT}.dist" - return 1 - fi - return 0 + [ -n "${CONTROL_PORT}" ] && command_args="${command_args} -p ${CONTROL_PORT}" + [ "${CONFIG_FILE}" != "${CONFIG_FILE_DEFAULT}" ] && command_args="${command_args} -c ${CONFIG_FILE}" + + if [ ! -f "${CONFIG_FILE}" ]; then + eerror "Please create ${CONFIG_FILE}" + eerror "Sample conf: ${CONFIG_FILE_DEFAULT}.dist" + return 1 + fi + return 0 } start() { config_check || return ${?} - ebegin "Starting Serial to network proxy (${SVCNAME})" - start-stop-daemon --start --quiet --pidfile /var/run/${SVCNAME}.pid \ - --exec /usr/sbin/ser2net -- ${SER2NET_OPTS} -P /var/run/${SVCNAME}.pid + ebegin "Starting ${description}" + start-stop-daemon --start --quiet --pidfile "${pidfile}" \ + --exec "${command}" -- ${command_args} -P "${pidfile}" eend ${?} } stop() { - ebegin "Stopping Serial to network proxy (${SVCNAME})" - start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid + ebegin "Stopping ${description}" + start-stop-daemon --stop --quiet --pidfile "${pidfile}" + eend ${?} +} + +reload() { + ebegin "Reloading ${description}" + start-stop-daemon --stop --signal HUP --oknodo --pidfile "${pidfile}" eend ${?} } |