diff options
author | Mike Frysinger <vapier@gentoo.org> | 2004-02-13 19:09:20 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2004-02-13 19:09:20 +0000 |
commit | c27ee686790a0b18319d1852b456050cafcc4662 (patch) | |
tree | 1b29f3e93367bd4dbd1b1ecea77b97d19a8f9dc1 | |
parent | move to stable #41454 (diff) | |
download | gentoo-2-c27ee686790a0b18319d1852b456050cafcc4662.tar.gz gentoo-2-c27ee686790a0b18319d1852b456050cafcc4662.tar.bz2 gentoo-2-c27ee686790a0b18319d1852b456050cafcc4662.zip |
update license
-rw-r--r-- | app-admin/conserver/files/conserver.confd | 6 | ||||
-rw-r--r-- | app-admin/conserver/files/conserver.initd | 22 | ||||
-rw-r--r-- | app-admin/prelude-lml/files/gentoo.init | 8 | ||||
-rw-r--r-- | app-admin/prelude-manager/files/gentoo.init | 8 | ||||
-rw-r--r-- | app-admin/quickswitch/files/net.eth0-switchto.rc6 | 8 | ||||
-rw-r--r-- | app-admin/sysklogd/files/sysklogd.rc6 | 10 | ||||
-rw-r--r-- | app-admin/syslog-ng/files/syslog-ng.rc6 | 22 |
7 files changed, 40 insertions, 44 deletions
diff --git a/app-admin/conserver/files/conserver.confd b/app-admin/conserver/files/conserver.confd index 929b6e7a3448..8ef8fa064439 100644 --- a/app-admin/conserver/files/conserver.confd +++ b/app-admin/conserver/files/conserver.confd @@ -1,6 +1,6 @@ -# Copyright 2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/files/conserver.confd,v 1.1 2003/10/03 23:40:16 weeve Exp $ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/files/conserver.confd,v 1.2 2004/02/13 19:06:42 vapier Exp $ ## Config file for /etc/init.d/conserver diff --git a/app-admin/conserver/files/conserver.initd b/app-admin/conserver/files/conserver.initd index 421d19279282..7677901ae4ab 100644 --- a/app-admin/conserver/files/conserver.initd +++ b/app-admin/conserver/files/conserver.initd @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/files/conserver.initd,v 1.1 2003/10/03 23:40:16 weeve Exp $ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/files/conserver.initd,v 1.2 2004/02/13 19:06:42 vapier Exp $ depend() { need clock @@ -24,15 +24,15 @@ checkconfig() { } start() { - checkconfig || return 1 - ebegin "Starting conserver" - start-stop-daemon --start --quiet --exec \ - /usr/sbin/conserver -- ${CONSERVER_OPTS} 1>/dev/null - eend $? "Failed to start conserver" + checkconfig || return 1 + ebegin "Starting conserver" + start-stop-daemon --start --quiet --exec \ + /usr/sbin/conserver -- ${CONSERVER_OPTS} 1>/dev/null + eend $? "Failed to start conserver" } stop() { - ebegin "Stopping conserver" - start-stop-daemon --stop --quiet --pidfile /var/run/conserver.pid - eend $? "Failed to stop conserver" + ebegin "Stopping conserver" + start-stop-daemon --stop --quiet --pidfile /var/run/conserver.pid + eend $? "Failed to stop conserver" } diff --git a/app-admin/prelude-lml/files/gentoo.init b/app-admin/prelude-lml/files/gentoo.init index 7ad1079b8e40..7ac2ec20d236 100644 --- a/app-admin/prelude-lml/files/gentoo.init +++ b/app-admin/prelude-lml/files/gentoo.init @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-lml/files/gentoo.init,v 1.2 2004/01/21 19:14:48 mboman Exp $ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-lml/files/gentoo.init,v 1.3 2004/02/13 19:07:22 vapier Exp $ PROGNAME=`basename $1` @@ -18,6 +18,6 @@ start() { stop() { ebegin "Stop ${PROGNAME}..." - start-stop-daemon --stop --quiet --exec /usr/bin/${PROGNAME} + start-stop-daemon --stop --quiet --exec /usr/bin/${PROGNAME} eend $? } diff --git a/app-admin/prelude-manager/files/gentoo.init b/app-admin/prelude-manager/files/gentoo.init index 3d63ad1f79b0..4602bfa8ab35 100644 --- a/app-admin/prelude-manager/files/gentoo.init +++ b/app-admin/prelude-manager/files/gentoo.init @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-manager/files/gentoo.init,v 1.2 2004/01/21 19:16:24 mboman Exp $ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/prelude-manager/files/gentoo.init,v 1.3 2004/02/13 19:07:43 vapier Exp $ PROGNAME=`basename $1` @@ -17,6 +17,6 @@ start() { stop() { ebegin "Stop ${PROGNAME}..." - start-stop-daemon --stop --quiet --exec /usr/bin/${PROGNAME} &> /dev/null + start-stop-daemon --stop --quiet --exec /usr/bin/${PROGNAME} &> /dev/null eend $? } diff --git a/app-admin/quickswitch/files/net.eth0-switchto.rc6 b/app-admin/quickswitch/files/net.eth0-switchto.rc6 index 4ea968a2c923..a275256ee7ff 100644 --- a/app-admin/quickswitch/files/net.eth0-switchto.rc6 +++ b/app-admin/quickswitch/files/net.eth0-switchto.rc6 @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/app-admin/quickswitch/files/net.eth0-switchto.rc6,v 1.3 2003/02/14 22:34:44 vapier Exp $ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/quickswitch/files/net.eth0-switchto.rc6,v 1.4 2004/02/13 19:08:08 vapier Exp $ checkconfig() { if [ ! -e /etc/quickswitch/switch.conf ]; then @@ -19,5 +19,5 @@ start() { } end() { - echo > /dev/null 2>&1 + true } diff --git a/app-admin/sysklogd/files/sysklogd.rc6 b/app-admin/sysklogd/files/sysklogd.rc6 index 59e762787f11..fdb73c3a3489 100644 --- a/app-admin/sysklogd/files/sysklogd.rc6 +++ b/app-admin/sysklogd/files/sysklogd.rc6 @@ -1,18 +1,16 @@ #!/sbin/runscript -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/files/sysklogd.rc6,v 1.6 2003/07/28 07:08:12 azarah Exp $ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/files/sysklogd.rc6,v 1.7 2004/02/13 19:08:43 vapier Exp $ # NB: Config is in /etc/conf.d/sysklogd - depend() { need clock hostname provide logger } start() { - ebegin "Starting syslogd, klogd" start-stop-daemon --start --quiet --background --exec /usr/sbin/syslogd \ -- ${SYSLOGD} @@ -28,7 +26,6 @@ start() { } stop() { - ebegin "Stopping syslogd, klogd" start-stop-daemon --stop --retry 1 --quiet --pidfile /var/run/syslogd.pid retval=$? @@ -36,4 +33,3 @@ stop() { retval=$(( ${retval} + $? )) eend ${retval} "Failed to stop klogd, syslogd" } - diff --git a/app-admin/syslog-ng/files/syslog-ng.rc6 b/app-admin/syslog-ng/files/syslog-ng.rc6 index e581d4b24b59..910111a6a299 100644 --- a/app-admin/syslog-ng/files/syslog-ng.rc6 +++ b/app-admin/syslog-ng/files/syslog-ng.rc6 @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6,v 1.10 2003/02/28 04:25:10 agriffis Exp $ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6,v 1.11 2004/02/13 19:09:20 vapier Exp $ opts="depend checkconfig start stop reload" @@ -19,17 +19,17 @@ checkconfig() { } start() { - checkconfig || return 1 - ebegin "Starting syslog-ng" - start-stop-daemon --start --quiet --exec /usr/sbin/syslog-ng - eend $? "Failed to start syslog-ng" + checkconfig || return 1 + ebegin "Starting syslog-ng" + start-stop-daemon --start --quiet --exec /usr/sbin/syslog-ng + eend $? "Failed to start syslog-ng" } stop() { - ebegin "Stopping syslog-ng" - start-stop-daemon --stop --quiet --pidfile /var/run/syslog-ng.pid - eend $? "Failed to stop syslog-ng" - sleep 1 # needed for syslog-ng to stop in case we're restarting + ebegin "Stopping syslog-ng" + start-stop-daemon --stop --quiet --pidfile /var/run/syslog-ng.pid + eend $? "Failed to stop syslog-ng" + sleep 1 # needed for syslog-ng to stop in case we're restarting } reload() { |