[gentoo-commits] gentoo-x86 commit in net-irc/quassel/files: quasselcore.init

[Markus Ullmann (jokey)]

jokey       08/08/30 19:02:55

  Modified:             quasselcore.init
  Log:
  Make init script baselayout-1 compatible wrt bug #235953 thanks to Daniel Pielmeier, revbump released versions and fix naming for the live ebuild
  (Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo i686)

Revision  Changes    Path
1.2                  net-irc/quassel/files/quasselcore.init

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/files/quasselcore.init?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/files/quasselcore.init?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/files/quasselcore.init?r1=1.1&r2=1.2

Index: quasselcore.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/files/quasselcore.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quasselcore.init	26 Aug 2008 12:01:44 -0000	1.1
+++ quasselcore.init	30 Aug 2008 19:02:54 -0000	1.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/files/quasselcore.init,v 1.1 2008/08/26 12:01:44 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/files/quasselcore.init,v 1.2 2008/08/30 19:02:54 jokey Exp $
 
 depend() {
 	need net
@@ -9,14 +9,21 @@
 
 start() {
 	ebegin "Starting Quassel Core"
-	start-stop-daemon --start --user $QUASSEL_USER --background --make-pidfile \
-	--pidfile /var/run/quassel.pid --exec /usr/bin/quasselcore -- ${QUASSEL_OPTS}
+	if [ -x /etc/init.d/root ]; then
+		# running on baselayout-2/openrc
+		start-stop-daemon --start --user ${QUASSEL_USER} --background --make-pidfile \
+		--pidfile /var/run/quassel.pid --exec /usr/bin/quasselcore -- ${QUASSEL_OPTS}
+	else
+		# running on baselayout-1
+		start-stop-daemon --start --chuid ${QUASSEL_USER} --background --make-pidfile \
+		--pidfile /var/run/quassel.pid --env HOME="/home/${QUASSEL_USER}" \
+		--exec /usr/bin/quasselcore -- ${QUASSEL_OPTS}
+	fi
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Quassel Core"
-	start-stop-daemon --stop --user $QUASSEL_USER --pidfile /var/run/quassel.pid \
-	--exec /usr/bin/quasselcore
+	start-stop-daemon --stop --pidfile /var/run/quassel.pid --exec /usr/bin/quasselcore
 	eend $?
 }