summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-03-30 05:57:32 +0000
committerMike Frysinger <vapier@gentoo.org>2007-03-30 05:57:32 +0000
commit691a6db7d6970b3f3a578e18a8b8c11e9f4922b5 (patch)
tree3088088974013069c9750cc427312389d2026c35 /sys-devel/prelink
parentSuccessfully tested on sparc. (diff)
downloadgentoo-2-691a6db7d6970b3f3a578e18a8b8c11e9f4922b5.tar.gz
gentoo-2-691a6db7d6970b3f3a578e18a8b8c11e9f4922b5.tar.bz2
gentoo-2-691a6db7d6970b3f3a578e18a8b8c11e9f4922b5.zip
Make cronjob prelinking control tristate (yes, no, user-controlled) as suggested by Antti Mäkelä #172543.
(Portage version: 2.1.2.2)
Diffstat (limited to 'sys-devel/prelink')
-rw-r--r--sys-devel/prelink/ChangeLog7
-rw-r--r--sys-devel/prelink/files/prelink.confd7
-rw-r--r--sys-devel/prelink/files/prelink.cron5
3 files changed, 16 insertions, 3 deletions
diff --git a/sys-devel/prelink/ChangeLog b/sys-devel/prelink/ChangeLog
index ab67e1fb6c93..80f9ee1808da 100644
--- a/sys-devel/prelink/ChangeLog
+++ b/sys-devel/prelink/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-devel/prelink
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/ChangeLog,v 1.52 2007/03/25 05:30:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/ChangeLog,v 1.53 2007/03/30 05:57:32 vapier Exp $
+
+ 30 Mar 2007; Mike Frysinger <vapier@gentoo.org> files/prelink.confd,
+ files/prelink.cron:
+ Make cronjob prelinking control tristate (yes, no, user-controlled) as
+ suggested by Antti Mäkelä #172543.
25 Mar 2007; Mike Frysinger <vapier@gentoo.org> files/prelink.cron:
Make sure we change KDE_IS_PRELINKED in /etc/env.d/ accordingly as suggested
diff --git a/sys-devel/prelink/files/prelink.confd b/sys-devel/prelink/files/prelink.confd
index e789bd0488e3..6b89b8c1f1fd 100644
--- a/sys-devel/prelink/files/prelink.confd
+++ b/sys-devel/prelink/files/prelink.confd
@@ -1,10 +1,13 @@
# For an in depth prelinking guide, please see:
# http://www.gentoo.org/doc/en/prelink-howto.xml
-# Set this to no to disable prelinking altogether
+# Control prelinking behavior in the cronjob.
+# yes - automatically prelink the system
+# no - automatically un-prelink the system
+# "" - do nothing at all (user manages)
# (if you change this from yes to no prelink -ua
# will be run next night to undo prelinking)
-PRELINKING=no
+PRELINKING=""
# Options to pass to prelink
# -m Try to conserve virtual memory by allowing overlapping
diff --git a/sys-devel/prelink/files/prelink.cron b/sys-devel/prelink/files/prelink.cron
index 2561e9d3727a..945d419d5083 100644
--- a/sys-devel/prelink/files/prelink.cron
+++ b/sys-devel/prelink/files/prelink.cron
@@ -2,6 +2,11 @@
. /etc/conf.d/prelink
+case $PRELINKING in
+ yes|no);;
+ *) exit 0;;
+esac
+
renice +19 -p $$ >/dev/null 2>&1
if [ "$PRELINKING" != yes ]; then