summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/slocate')
-rw-r--r--sys-apps/slocate/ChangeLog8
-rw-r--r--sys-apps/slocate/files/slocate-3.1-cron2.patch7
2 files changed, 11 insertions, 4 deletions
diff --git a/sys-apps/slocate/ChangeLog b/sys-apps/slocate/ChangeLog
index 72f936eef035..c7f8dccd7d62 100644
--- a/sys-apps/slocate/ChangeLog
+++ b/sys-apps/slocate/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/slocate
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.84 2008/12/02 20:09:15 vapier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.85 2009/02/07 07:45:14 vapier Exp $
+
+ 07 Feb 2009; Mike Frysinger <vapier@gentoo.org>
+ files/slocate-3.1-cron2.patch:
+ Allow people to disable ionice args #257475 by Jan-Matthias Braun.
02 Dec 2008; Mike Frysinger <vapier@gentoo.org> files/updatedb.conf:
Add ocfs/ocfs2 to PRUNEFS #249590 by Oleg Gawriloff.
diff --git a/sys-apps/slocate/files/slocate-3.1-cron2.patch b/sys-apps/slocate/files/slocate-3.1-cron2.patch
index 8229a99a7303..8ed1648ce0b8 100644
--- a/sys-apps/slocate/files/slocate-3.1-cron2.patch
+++ b/sys-apps/slocate/files/slocate-3.1-cron2.patch
@@ -1,6 +1,6 @@
--- debian/cron.daily
+++ debian/cron.daily
-@@ -1,12 +1,18 @@
+@@ -1,12 +1,21 @@
#! /bin/sh
-if [ -x /usr/bin/slocate ]
@@ -19,7 +19,10 @@
+
+ # run on active process in case ionice isnt installed, or
+ # system is really old and ionice doesnt work ...
-+ ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} -p $$ 2>/dev/null
++ ioflags=
++ [ -n "${IONICE_CLASS}" ] && ioflags="-c ${IONICE_CLASS}"
++ [ -n "${IONICE_PRIORITY}" ] && ioflags="-n ${IONICE_PRIORITY}"
++ [ -n "${ioflags}" ] && ionice ${ioflags} -p $$ 2>/dev/null
+
+ nice -n ${NICE:-10} /usr/bin/updatedb ${args}
fi