[gentoo-commits] gentoo-x86 commit in sys-apps/mlocate/files: mlocate.cron-r2 updatedb.conf mlocate-cron.conf

[Tomas Chvatal (scarabeus)]

scarabeus    11/01/24 12:39:33

  Modified:             mlocate.cron-r2 updatedb.conf mlocate-cron.conf
  Log:
  Update cronscript and config to be more strict and flexible.
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sys-apps/mlocate/files/mlocate.cron-r2

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/mlocate/files/mlocate.cron-r2?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/mlocate/files/mlocate.cron-r2?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/mlocate/files/mlocate.cron-r2?r1=1.1&r2=1.2

Index: mlocate.cron-r2
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/mlocate/files/mlocate.cron-r2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mlocate.cron-r2	18 Nov 2009 10:29:13 -0000	1.1
+++ mlocate.cron-r2	24 Jan 2011 12:39:33 -0000	1.2
@@ -1,22 +1,48 @@
 #! /bin/sh
+set -e
 
-if [ -x /usr/bin/updatedb ]
-then
-	if [ -f /etc/updatedb.conf ]
-	then
-	    args=""
-	else
-	    args="-f proc"
+# check if we run on battery and if so then don't run
+if which on_ac_power >/dev/null 2>&1; then
+	ON_BATTERY=0
+	on_ac_power >/dev/null 2>&1 || ON_BATTERY=$?
+	if [ "${ON_BATTERY}" -eq 1 ]; then
+			exit 0
 	fi
+fi
 
-	if [ -f /etc/mlocate-cron.conf ]
-	then
-		. /etc/mlocate-cron.conf
-	fi
+# check if we are already running (lockfile)
+LOCKFILE="/var/lock/mlocate.daily.lock"
+trap "rm -f ${LOCKFILE}" EXIT
+if [ -e "${LOCKFILE}" ]; then
+	echo >&2 "Warning: \"${LOCKFILE}\" already present, not running updatedb."
+	exit 1
+else
+	touch "${LOCKFILE}"
+fi
+
+# source the user specified variables
+if [ -f /etc/mlocate-cron.conf ]; then
+	. /etc/mlocate-cron.conf
+fi
+
+# check the config file
+ARGS=""
+if [ ! -f /etc/updatedb.conf ]; then
+	nodevs=$(< /proc/filesystems awk '$1 == "nodev" && $2 != "rootfs" { print $2 }')
+	ARGS="-f ${nodevs}"
+fi
 
-	# 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
+# alter the priority of the updatedb process
+if [ -x /usr/bin/renice ]; then
+	/usr/bin/renice +${NICE:-19} -p $$ > /dev/null 2>&1
+if [ -x /usr/bin/ionice ] && /usr/bin/ionice -c3 true 2>/dev/null; then
+	/usr/bin/ionice -c${IONICE_CLASS:-2} -n${IONICE_PRIORITY:-7} -p $$ > /dev/null 2>&1
+fi
 
-	nice -n ${NICE:-10} /usr/bin/updatedb ${args}
+# run the updatedb if possible
+if [ -x /usr/bin/updatedb ]; then
+	/usr/bin/updatedb ${ARGS}
+else
+	echo >&2 "Warning: \"/usr/bin/updatedb\" is not executable, unable to run updatedb."
+	exit 0
 fi



1.5                  sys-apps/mlocate/files/updatedb.conf

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/mlocate/files/updatedb.conf?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/mlocate/files/updatedb.conf?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/mlocate/files/updatedb.conf?r1=1.4&r2=1.5

Index: updatedb.conf
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/mlocate/files/updatedb.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- updatedb.conf	21 Nov 2010 14:57:13 -0000	1.4
+++ updatedb.conf	24 Jan 2011 12:39:33 -0000	1.5
@@ -1,14 +1,17 @@
 # /etc/updatedb.conf: config file for slocate
-# $Id: updatedb.conf,v 1.4 2010/11/21 14:57:13 fauli Exp $
+# $Id: updatedb.conf,v 1.5 2011/01/24 12:39:33 scarabeus Exp $
 
 # This file sets variables that are used by updatedb.
 # For more info, see the updatedb.conf(5) manpage.
 
 # Filesystems that are pruned from updatedb database
-PRUNEFS="afs auto autofs cifs devfs devpts eventpollfs futexfs gfs hostfs hugetlbfs iso9660 mqueue ncpfs nfs NFS nfs4 nfsd nnpfs ocfs ocfs2 pipefs proc ramfs rpc_pipefs selinuxfs sfs shfs smbfs sockfs spufs subfs supermount sysfs tmpfs udf usbfs vperfctrfs"
+PRUNEFS="afs anon_inodefs auto autofs bdev binfmt binfmt_misc cgroup cifs coda configfs cramfs cpuset debugfs devpts devtmps devfs devpts ecryptfs eventpollfs exofs futexfs ftpfs fuse fusectl gfs gfs2 hostfs hugetlbfs inotifyfs iso9660 jffs2 lustre misc mqueue ncpfs nfs NFS nfs4 nfsd nnpfs ocfs ocfs2 pipefs proc ramfs rpc_pipefs securityfs selinuxfs sfs shfs smbfs sockfs spufs sshfs subfs supermount sysfs tmpfs ubifs udf usbfs vboxsf vperfctrfs"
 
 # Paths which are pruned from updatedb database
-PRUNEPATHS="/tmp /var/tmp /root/.ccache"
+PRUNEPATHS="/tmp /var/tmp /var/cache /var/lock /var/run /var/spool"
+
+# Folder names that are pruned from updatedb database
+PRUNENAMES=".git .hg .svn CVS"
 
 # Skip bind mounts.
-PRUNE_BIND_MOUNTS="no"
+PRUNE_BIND_MOUNTS="yes"



1.2                  sys-apps/mlocate/files/mlocate-cron.conf

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/mlocate/files/mlocate-cron.conf?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/mlocate/files/mlocate-cron.conf?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/mlocate/files/mlocate-cron.conf?r1=1.1&r2=1.2

Index: mlocate-cron.conf
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/mlocate/files/mlocate-cron.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mlocate-cron.conf	7 Sep 2008 02:12:11 -0000	1.1
+++ mlocate-cron.conf	24 Jan 2011 12:39:33 -0000	1.2
@@ -1,5 +1,5 @@
 # nice value to run at: see -n in nice(1)
-NICE="10"
+NICE="19"
 
 # ionice class to run at: see -c in ionice(1)
 # you have to install sys-apps/util-linux manually