sys-app/preload - fix init script (see ChangeLog for details)

(Portage version: 2.2_rc12/cvs/Linux 2.6.27-git6 x86_64)

4 files changed, 26 insertions, 14 deletions

diff --git a/sys-apps/preload/ChangeLog b/sys-apps/preload/ChangeLog
index 59f2834919ae..6249e86345c4 100644
--- a/sys-apps/preload/ChangeLog
+++ b/sys-apps/preload/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/preload
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/ChangeLog,v 1.6 2008/10/24 01:38:43 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/ChangeLog,v 1.7 2008/10/28 02:02:14 darkside Exp $
+
+*preload-0.6.3-r5 (28 Oct 2008)
+
+  28 Oct 2008; Jeremy Olexa <darkside@gentoo.org> files/conf.d-preload,
+  files/init.d-preload, -preload-0.6.3-r4.ebuild, +preload-0.6.3-r5.ebuild:
+  sys-apps/preload - final init script fixing to capture the pid properly as
+  reported in bug #243832 (thanks for the help Kai). Version bump so people
+  get a working (so I think) init script. Removing bashisms, as reported in
+  bug #244491 is also fixed with this commit (thanks to Davide Pesavento).
+  Hey, 2 bugs in one!
 
 *preload-0.6.3-r4 (24 Oct 2008)
 
diff --git a/sys-apps/preload/files/conf.d-preload b/sys-apps/preload/files/conf.d-preload
index fdca718a67df..400778d091a4 100644
--- a/sys-apps/preload/files/conf.d-preload
+++ b/sys-apps/preload/files/conf.d-preload
@@ -1,8 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/files/conf.d-preload,v 1.5 2008/10/24 01:38:43 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/files/conf.d-preload,v 1.6 2008/10/28 02:02:14 darkside Exp $
 # preload configuration file
 
-# verbosity.  0-9, Default is 4.
+PIDFILE="/var/run/preload.pid"
+
+# verbosity. 0-10, Default is 4.
 #PRELOAD_VERBOSITY="4"
 
 # set this for niceness. Default is 15. Valid ranges are from -20 to 19. See
diff --git a/sys-apps/preload/files/init.d-preload b/sys-apps/preload/files/init.d-preload
index 43e570768ef5..1846adb39b8b 100644
--- a/sys-apps/preload/files/init.d-preload
+++ b/sys-apps/preload/files/init.d-preload
@@ -1,29 +1,29 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/files/init.d-preload,v 1.4 2008/10/24 01:38:43 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/files/init.d-preload,v 1.5 2008/10/28 02:02:14 darkside Exp $
 
 depend() {
 	after localmount xdm
 }
 
-# Note: pid changes so we can't use a PIDFILE type thing.
 start() {
 	ebegin "Starting preload"
-	start-stop-daemon --start --quiet --exec /usr/sbin/preload -- \
+	start-stop-daemon --start --quiet --background \
+	--make-pidfile --pidfile ${PIDFILE} --exec /usr/sbin/preload -- \
 	-l ${PRELOAD_LOGFILE:-/var/log/preload.log} -V ${PRELOAD_VERBOSITY:-4} \
-	-n ${PRELOAD_NICE:-15} -s ${PRELOAD_STATEFILE:-""}
+	-n ${PRELOAD_NICE:-15} -s ${PRELOAD_STATEFILE:-""} -f
 
-	IONICE=$(type -p ionice)
-	if [[ -x "${IONICE}" && -n "${IONICE_OPTS}" ]]; then
-		einfo "ionice'ing preload"
-		${IONICE} "${IONICE_OPTS}" -p $(pidof preload)
+	IONICE="$(command -v ionice)"
+	if [ -x "${IONICE}" -a -n "${IONICE_OPTS}" ]; then
+		einfo "ionicing preload"
+		"${IONICE}" "${IONICE_OPTS}" -p $(<${PIDFILE})
 	fi
 	eend $?
 }
 
 stop() {
-	ebegin "Stopping preload"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/preload
+	ebegin "Stopping preload (may take awhile)"
+	start-stop-daemon --stop --retry 120 --quiet --pidfile ${PIDFILE}
 	eend $?
 }
diff --git a/sys-apps/preload/preload-0.6.3-r4.ebuild b/sys-apps/preload/preload-0.6.3-r5.ebuild
index 2070033d9fbc..b8ae5d576c4e 100644
--- a/sys-apps/preload/preload-0.6.3-r4.ebuild
+++ b/sys-apps/preload/preload-0.6.3-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/preload-0.6.3-r4.ebuild,v 1.1 2008/10/24 01:38:43 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/preload-0.6.3-r5.ebuild,v 1.1 2008/10/28 02:02:14 darkside Exp $
 
 inherit eutils