sys-apps/preload - fix init script for bug 242578 and better handle 'default' values

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-git6 x86_64

5 files changed, 27 insertions, 23 deletions

diff --git a/sys-apps/preload/ChangeLog b/sys-apps/preload/ChangeLog
index e61ffff7645f..6ce86401c7a5 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.4 2008/10/20 22:58:40 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/ChangeLog,v 1.5 2008/10/23 15:16:14 darkside Exp $
+
+*preload-0.6.3-r3 (23 Oct 2008)
+
+  23 Oct 2008; Jeremy Olexa <darkside@gentoo.org> files/conf.d-preload,
+  files/init.d-preload, -preload-0.6.3-r2.ebuild, +preload-0.6.3-r3.ebuild:
+  Remove restart() block from init script. It doesn't do anything on openrc
+  (bug #241884) and it causes warnings on baselayout-1 (bug #242578) due to
+  poor implementation on my part. We really don't need a restart because a
+  stop/start is just as good. Also modify init/conf scripts to better handle
+  'default' values.
 
 *preload-0.6.3-r2 (20 Oct 2008)
 
diff --git a/sys-apps/preload/Manifest b/sys-apps/preload/Manifest
index d86ddbf00e75..0045dd0a4a8b 100644
--- a/sys-apps/preload/Manifest
+++ b/sys-apps/preload/Manifest
@@ -1,8 +1,8 @@
-AUX conf.d-preload 707 RMD160 37054785acd8f307a75544708d1d37d193abc9c3 SHA1 d9b8054f82fe9e8c49dd7201cefc8b79f4091f95 SHA256 967211b9342b46311f26a70c8ea4f2ea27184c96dcfc57cd30b49cc8274f114a
-AUX init.d-preload 686 RMD160 c3e8a16df3bc2f42dbbad96438a7d223d4c84e70 SHA1 3120a33169b1f2381093567869f7d613c379eb6c SHA256 53a6b029e77d9e3fc1b864982dbfe11e0472e544aa2814eec4710c2f13691d65
+AUX conf.d-preload 768 RMD160 b97d408b211033a9fb6eb3ac61126aecd11694aa SHA1 d4cf1eb84bb71aded163f417ac84354c7f3e1f26 SHA256 c31acf06d8e78582a3ee43b9971ac76e4a3f4c54579eddd0a91f142e959563cd
+AUX init.d-preload 611 RMD160 509af059f4733ec4890e004c8260b184ce4cd601 SHA1 7cda589c29ca7c8a4b9e0589e4affc578bcf3d01 SHA256 b3fb493990b951e09bb008a091e11c20632a8019de8141237dbc26cd90a08c01
 AUX preload-0.6.3-conf.patch 565 RMD160 a179cc629466db6b4c8338572dcfedd5df8648fa SHA1 2edf461357da6b3e92a56917f35da8e8409849e8 SHA256 0830b5cd1df5ada7ccb33803cc2a5349200d1f2422ac1d1a2daf94a8a1e8fc56
 DIST preload-0.6.3.tar.gz 139587 RMD160 ba0666ee67780961651a99ac60068265d29c288a SHA1 3733693e186ebc8965f164a3fd7afa2cf558fec5 SHA256 de6a79ca1426f8a2710135b78fd9edb34e3a152e9cdd7cfd68166399171f358b
 EBUILD preload-0.6.3-r1.ebuild 935 RMD160 1a3333ca4f785dda7ea1967e6c2a0369be8c1ea5 SHA1 e90125b7842051730e04f8fd04943d47a01dc207 SHA256 af2105d874f57ba2d79ddfcfbb8567189b5e96147a4762b4399beaf48ce48193
-EBUILD preload-0.6.3-r2.ebuild 1132 RMD160 e5f5c8c7e47151744f47103e8ef2673bc493d42b SHA1 235f09b7de85ce50e02999072a4a3bcea60124d4 SHA256 6592fa3d2e7bbcba505924e4d96e89dd99f89b3db80a0f8f7a46d8cc2d68397d
-MISC ChangeLog 1253 RMD160 22743ae65b65ce2e64a2242a13751b0071bd3768 SHA1 d0e023963d1c315d617b251d3f551652c3d3aad5 SHA256 97605701af9468d2c13636612dc3c81dd4c1862fe0bf7677701695b38f1a77a3
+EBUILD preload-0.6.3-r3.ebuild 1132 RMD160 ee6da7d808f429addbe5f11554566ecfce393c64 SHA1 1d34b869c7279d383181f0157041c3af199d935d SHA256 a010bbe76714c0e0d0823e0caf6564b87488cccf05153ace64b47b657d6d8db7
+MISC ChangeLog 1759 RMD160 508243180b3c288a19f8a10c50e518552b04b128 SHA1 616346b8393bcf50ced56b0110ca9a7310c8399d SHA256 c027021ea6c94c834a2a978768f54c4deb5b3ce71ae53eda836b032f043d7ac0
 MISC metadata.xml 503 RMD160 38ab96ae80e53c44b88512bec1409281cf06ef56 SHA1 4196948def119ac92327edf1307cc9a1bd0f4162 SHA256 0cbf6f727b2d3bc82e3a3d949dc9cb003029789718735e32cbc77e28eaa21b24
diff --git a/sys-apps/preload/files/conf.d-preload b/sys-apps/preload/files/conf.d-preload
index 52de3301b6b7..5989d53fa046 100644
--- a/sys-apps/preload/files/conf.d-preload
+++ b/sys-apps/preload/files/conf.d-preload
@@ -1,19 +1,19 @@
 # Copyright 1999-2008 Gentoo Foundation
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/files/conf.d-preload,v 1.3 2008/10/20 22:58:41 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/files/conf.d-preload,v 1.4 2008/10/23 15:16:14 darkside Exp $
 # preload configuration file
 
 # verbosity.  0-9, Default is 4.
-PRELOAD_VERBOSITY="4"
+#PRELOAD_VERBOSITY="4"
 
-# set this for niceness. Default is 15
-PRELOAD_NICE="15"
+# set this for niceness. Default is 15. Valid ranges are from -20 to 19. See
+# nice(1) man page. 
+#PRELOAD_NICE="15"
 
 # log file (default is /var/log/preload.log )
-PRELOAD_LOGFILE="/var/log/preload.log"
+#PRELOAD_LOGFILE="/var/log/preload.log"
 
-# prelaod state file (default is /var/lib/preload/preload.state ) 
-# Empty means no state is saved.
-#PRELOAD_STATEFILE="\"\""
+# preload state file (default location is /var/lib/preload/preload.state ) 
+# Empty (commented out) means no state is saved.
 PRELOAD_STATEFILE="/var/lib/preload/preload.state"
 
 ## Not supported in Gentoo yet. Patches to init script welcome. ##
diff --git a/sys-apps/preload/files/init.d-preload b/sys-apps/preload/files/init.d-preload
index 9cce830963e0..f4b5e395f289 100644
--- a/sys-apps/preload/files/init.d-preload
+++ b/sys-apps/preload/files/init.d-preload
@@ -1,23 +1,17 @@
 #!/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.2 2008/10/20 18:58:11 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/files/init.d-preload,v 1.3 2008/10/23 15:16:14 darkside Exp $
 
 depend() {
 	after xdm
 }
 
-restart() {
-    ebegin "Reloading config for preload"
-    killall -SIGHUP /usr/sbin/preload
-    eend $?
-}
- 
 start() {
 	ebegin "Starting preload"
 	start-stop-daemon --start --quiet --exec /usr/sbin/preload -- \
-	-l ${PRELOAD_LOGFILE} -V ${PRELOAD_VERBOSITY} -n ${PRELOAD_NICE} \
-	-s ${PRELOAD_STATEFILE}
+	-l ${PRELOAD_LOGFILE:-/var/log/preload.log} -V ${PRELOAD_VERBOSITY:-4} \
+	-n ${PRELOAD_NICE:-15} -s ${PRELOAD_STATEFILE:-""}
 	eend $?
 }
 
diff --git a/sys-apps/preload/preload-0.6.3-r2.ebuild b/sys-apps/preload/preload-0.6.3-r3.ebuild
index c9683aece7d7..5e8c34030642 100644
--- a/sys-apps/preload/preload-0.6.3-r2.ebuild
+++ b/sys-apps/preload/preload-0.6.3-r3.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-r2.ebuild,v 1.1 2008/10/20 22:58:40 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/preload/preload-0.6.3-r3.ebuild,v 1.1 2008/10/23 15:16:14 darkside Exp $
 
 EAPI="2"
 inherit eutils