rpms/readahead/devel readahead-upstart-0.6.patch, NONE, 1.1 readahead.spec, 1.62, 1.63

Harald Hoyer harald at fedoraproject.org
Thu Jan 28 12:11:24 UTC 2010 

Author: harald

Update of /cvs/pkgs/rpms/readahead/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11725

Modified Files:
	readahead.spec 
Added Files:
	readahead-upstart-0.6.patch 
Log Message:
* Fri Jan 15 2010 Harald Hoyer <harald at redhat.com> 1.5.4-3
- update for upstart-0.6
- Related: rhbz#543948


readahead-upstart-0.6.patch:
 b/scripts/Makefile.am                     |    4 -
 b/scripts/readahead-collector.conf        |   91 ++++++++++++++++++++++++++++++
 b/scripts/readahead-disable-services.conf |   24 +++++++
 b/scripts/readahead.conf                  |   65 +++++++++++++++++++++
 scripts/readahead-collector.event         |   83 ---------------------------
 scripts/readahead-disable-services.event  |   24 -------
 scripts/readahead.event                   |   64 ---------------------
 7 files changed, 182 insertions(+), 173 deletions(-)

--- NEW FILE readahead-upstart-0.6.patch ---
commit f4afc30ab5d6b31db838a0ce3f8ccfa20cabe650
Author: Harald Hoyer <harald at redhat.com>
Date:   Fri Jan 15 12:15:17 2010 +0100

    updated upstart conf file for upstart 0.6 and added kmsg output

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 739e17e..d25e32f 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -9,5 +9,5 @@ dist_sysconfcron_SCRIPTS = readahead.cron
 sysconfcronmonthlydir = $(sysconfdir)/cron.monthly
 dist_sysconfcronmonthly_SCRIPTS = readahead-monthly.cron
 
-eventdir = $(sysconfdir)/event.d
-dist_event_DATA = readahead-collector.event readahead-disable-services.event readahead.event
+initdir = $(sysconfdir)/init
+dist_init_DATA = readahead-collector.conf readahead-disable-services.conf readahead.conf
diff --git a/scripts/readahead-collector.conf b/scripts/readahead-collector.conf
new file mode 100644
index 0000000..9a1bd00
--- /dev/null
+++ b/scripts/readahead-collector.conf
@@ -0,0 +1,91 @@
+# readahead-collector - readahead-collector
+#
+# Starts readahead-collector
+
+start on startup
+
+stop on started prefdm or stopped rc[234] or runlevel [16]
+
+kill timeout 60
+
+script
+	# do not exit on failed commands
+	set +e
+	
+	. /etc/sysconfig/readahead
+	[ "$READAHEAD_COLLECT" != "yes" ] && exit 0
+	[ -f /.autofsck ] && exit 0
+	
+	[ -f /forcefsck ] && exit 0
+	if [ ! -f /.readahead_collect ]; then
+		[ "$READAHEAD_COLLECT_ON_RPM" != "yes" ] && exit 0
+                [ -f /var/lib/readahead/early.sorted ] && \    
+                        [ /var/lib/readahead/early.sorted -nt /var/lib/rpm/Packages ] && \
+                        exit 0
+	fi
+	
+	. /etc/init.d/functions
+
+	cmdline=$(cat /proc/cmdline)
+	strstr "$cmdline" autorelabel && exit 0
+	
+	if [ -f  /.autorelabel ]; then  	
+		# Check SELinux status
+		selinuxfs="$(fstab_decode_str `LC_ALL=C awk '/ selinuxfs / { print $2 }' /proc/mounts`)"
+		SELINUX_STATE=
+		if [ -n "$selinuxfs" ] && [ "`cat /proc/self/attr/current`" != "kernel" ]; then
+		    if [ -r "$selinuxfs/enforce" ] ; then
+			SELINUX_STATE=`cat "$selinuxfs/enforce"`
+		    else
+	                # assume enforcing if you can't read it
+	                SELINUX_STATE=1
+	            fi
+		fi
+	
+		if [ -n "$SELINUX_STATE" ]; then
+			exit 0
+		fi
+	fi
+	echo "<6>readahead-collector: starting" > /dev/kmsg
+	exec /sbin/readahead-collector -f
+end script
+
+pre-stop script
+	set +e
+
+	# after prefdm is startup collect some more seconds
+	. /etc/sysconfig/readahead
+	sleep ${READAHEAD_EXTRA_COLLECT:-10}
+	exit 0
+end script
+
+post-stop script
+	# do not exit on failed commands
+	set +e
+
+	. /etc/sysconfig/readahead
+	[ "$READAHEAD_COLLECT" != "yes" ] && exit 0
+	if [ ! -f /.readahead_collect ]; then
+		[ "$READAHEAD_COLLECT_ON_RPM" != "yes" ] && exit 0
+		[ -f /var/lib/readahead/early.sorted ] && \ 
+			[ /var/lib/readahead/early.sorted -nt /var/lib/rpm/Packages ] && \
+			exit 0
+	fi
+
+	rm -f /.readahead_collect
+	# start delayed services
+	runlevel=$(/sbin/runlevel| (read a b; echo $b))
+	for service in auditd restorecond; do
+		if [ -f /var/lock/subsys/delay-$runlevel-$service ]; then
+				echo "<6>readahead-collector: starting delayed service $service" > /dev/kmsg
+				/sbin/chkconfig --level $runlevel $service on 
+				/sbin/service $service start
+				rm -f /var/lock/subsys/delay-$runlevel-$service 
+		fi
+	done
+	# process lists
+	echo "<6>readahead-collector: sorting" > /dev/kmsg
+	/etc/cron.daily/readahead.cron 2>/dev/null 1>&2
+	echo "<6>readahead-collector: finished" > /dev/kmsg
+	exit 0
+end script
diff --git a/scripts/readahead-collector.event b/scripts/readahead-collector.event
deleted file mode 100644
index 17c5cd5..0000000
--- a/scripts/readahead-collector.event
+++ /dev/null
@@ -1,83 +0,0 @@
-# readahead-collector - readahead-collector
-#
-# Starts readahead-collector
-
-start on startup
-
-stop on started prefdm
-stop on stopped rc[234]
-stop on runlevel [16]
-
-kill timeout 60
-
-script
-	# do not exit on failed commands
-	set +e
-	
-	. /etc/sysconfig/readahead
-	[ "$READAHEAD_COLLECT" != "yes" ] && exit 0
-	[ -f /.autofsck ] && exit 0
-	
-	[ -f /forcefsck ] && exit 0
-	if [ ! -f /.readahead_collect ]; then
-		[ "$READAHEAD_COLLECT_ON_RPM" != "yes" ] && exit 0
-		[ /var/lib/readahead/early.sorted -nt /var/lib/rpm/Packages ] && exit 0
-	fi
-	
-	. /etc/init.d/functions
-
-	cmdline=$(cat /proc/cmdline)
-	strstr "$cmdline" autorelabel && exit 0
-	
-	if [ -f  /.autorelabel ]; then  	
-		# Check SELinux status
-		selinuxfs="$(fstab_decode_str `LC_ALL=C awk '/ selinuxfs / { print $2 }' /proc/mounts`)"
-		SELINUX_STATE=
-		if [ -n "$selinuxfs" ] && [ "`cat /proc/self/attr/current`" != "kernel" ]; then
-		    if [ -r "$selinuxfs/enforce" ] ; then
-			SELINUX_STATE=`cat "$selinuxfs/enforce"`
-		    else
-	                # assume enforcing if you can't read it
-	                SELINUX_STATE=1
-	            fi
-		fi
-	
-		if [ -n "$SELINUX_STATE" ]; then
-			exit 0
-		fi
-	fi
-
-	exec /sbin/readahead-collector -f
-end script
-
-pre-stop script
-	set +e
-	# after prefdm is startup collect some more seconds
-	. /etc/sysconfig/readahead
-	exec sleep ${READAHEAD_EXTRA_COLLECT:-10}
-end script
-
-post-stop script
-	# do not exit on failed commands
-	set +e
-	. /etc/sysconfig/readahead
-	[ "$READAHEAD_COLLECT" != "yes" ] && exit 0
-	if [ ! -f /.readahead_collect ]; then
-		[ "$READAHEAD_COLLECT_ON_RPM" != "yes" ] && exit 0
-		[ /var/lib/readahead/early.sorted -nt /var/lib/rpm/Packages ] && exit 0
-	fi
-
-	rm -f /.readahead_collect
-	# start delayed services
-	runlevel=$(/sbin/runlevel| (read a b; echo $b))
-	for service in auditd restorecond; do
-		if [ -f /var/lock/subsys/delay-$runlevel-$service ]; then
-				/sbin/chkconfig --level $runlevel $service on 
-				/sbin/service $service start
-				rm -f /var/lock/subsys/delay-$runlevel-$service 
-		fi
-	done
-	# process lists
-	/etc/cron.daily/readahead.cron 2>/dev/null 1>&2
-	exit 0
-end script
diff --git a/scripts/readahead-disable-services.conf b/scripts/readahead-disable-services.conf
new file mode 100644
index 0000000..f8cba6c
--- /dev/null
+++ b/scripts/readahead-disable-services.conf
@@ -0,0 +1,24 @@
+# readahead-disable-services - readahead-disable-services
+#
+# disable all services, which interfere with readahead-collector
+
+start on stopped rcS
+
+script
+	. /etc/sysconfig/readahead
+	[ "$READAHEAD_COLLECT" != "yes" ] && exit 0
+	if [ ! -f /.readahead_collect ]; then
+		[ "$READAHEAD_COLLECT_ON_RPM" != "yes" ] && exit 0
+		[ /var/lib/readahead/early.sorted -nt /var/lib/rpm/Packages ] && exit 0
+	fi
+	/sbin/pidof readahead-collector >/dev/null 2>&1 || exit 0
+	runlevel=$(/sbin/runlevel| (read a b; echo $b))
+	# delay startup of services, which do not play nicely with readahead
+	for service in auditd restorecond; do
+		if /sbin/chkconfig --level $runlevel $service ; then
+			/sbin/chkconfig --level $runlevel $service off
+			touch /var/lock/subsys/delay-$runlevel-$service
+		fi
+	done
+	exit 0
+end script
diff --git a/scripts/readahead-disable-services.event b/scripts/readahead-disable-services.event
deleted file mode 100644
index f8cba6c..0000000
--- a/scripts/readahead-disable-services.event
+++ /dev/null
@@ -1,24 +0,0 @@
-# readahead-disable-services - readahead-disable-services
-#
-# disable all services, which interfere with readahead-collector
-
-start on stopped rcS
-
-script
-	. /etc/sysconfig/readahead
-	[ "$READAHEAD_COLLECT" != "yes" ] && exit 0
-	if [ ! -f /.readahead_collect ]; then
-		[ "$READAHEAD_COLLECT_ON_RPM" != "yes" ] && exit 0
-		[ /var/lib/readahead/early.sorted -nt /var/lib/rpm/Packages ] && exit 0
-	fi
-	/sbin/pidof readahead-collector >/dev/null 2>&1 || exit 0
-	runlevel=$(/sbin/runlevel| (read a b; echo $b))
-	# delay startup of services, which do not play nicely with readahead
-	for service in auditd restorecond; do
-		if /sbin/chkconfig --level $runlevel $service ; then
-			/sbin/chkconfig --level $runlevel $service off
-			touch /var/lock/subsys/delay-$runlevel-$service
-		fi
-	done
-	exit 0
-end script
diff --git a/scripts/readahead.conf b/scripts/readahead.conf
new file mode 100644
index 0000000..acd20a8
--- /dev/null
+++ b/scripts/readahead.conf
@@ -0,0 +1,65 @@
+# readahead - readahead
+#
+# Starts readahead
+
+start on startup
+
+stop on started rc[16]
+
+console output
+
+script
+	# do not exit on failed commands
+	set +e
+	. /etc/sysconfig/readahead
+	[ "$READAHEAD" != "yes" ] && exit 0
+	[ -f /var/lib/readahead/early.sorted ] || exit 0
+	[ -f /.autofsck ] && exit 0
+	[ -f /forcefsck ] && exit 0
+
+	[ -f /.readahead_collect ] && exit 0
+	if [ "$READAHEAD_COLLECT_ON_RPM" == "yes" ]; then
+		[ /var/lib/readahead/early.sorted -nt /var/lib/rpm/Packages ] || exit 0
+	fi
+	
+	# Check for > 384 MB
+	read label val rest  < /proc/meminfo 
+	[ "$rest" = "kB" -a $val -gt 393216 ] || exit 0
+
+	. /etc/init.d/functions
+
+	cmdline=$(cat /proc/cmdline)
+	strstr "$cmdline" autorelabel && exit 0
+	
+	if [ -f  /.autorelabel ]; then  	
+		# Check SELinux status
+		selinuxfs="$(fstab_decode_str `LC_ALL=C awk '/ selinuxfs / { print $2 }' /proc/mounts`)"
+		SELINUX_STATE=
+		if [ -n "$selinuxfs" ] && [ "`cat /proc/self/attr/current`" != "kernel" ]; then
+		    if [ -r "$selinuxfs/enforce" ] ; then
+			SELINUX_STATE=`cat "$selinuxfs/enforce"`
+		    else
+	                # assume enforcing if you can't read it
+	                SELINUX_STATE=1
+	            fi
+		fi
+	
+		if [ -n "$SELINUX_STATE" ]; then
+			exit 0
+		fi
+	fi
+
+	
+	try=0
+	while [ $try -lt 10 ]; do
+		if test -d /usr/sbin; then
+			try=10
+		else
+			try=$[$try+1]
+			sleep 1
+		fi
+	done
+	echo "<6>readahead: starting" > /dev/kmsg
+	exec /sbin/readahead --dont-sort /var/lib/readahead/early.sorted
+end script
+
diff --git a/scripts/readahead.event b/scripts/readahead.event
deleted file mode 100644
index a611f07..0000000
--- a/scripts/readahead.event
+++ /dev/null
@@ -1,64 +0,0 @@
-# readahead - readahead
-#
-# Starts readahead
-
-start on startup
-
-stop on started rc[16]
-
-console output
-
-script
-	# do not exit on failed commands
-	set +e
-	. /etc/sysconfig/readahead
-	[ "$READAHEAD" != "yes" ] && exit 0
-	[ -f /var/lib/readahead/early.sorted ] || exit 0
-	[ -f /.autofsck ] && exit 0
-	[ -f /forcefsck ] && exit 0
-
-	[ -f /.readahead_collect ] && exit 0
-	if [ "$READAHEAD_COLLECT_ON_RPM" == "yes" ]; then
-		[ /var/lib/readahead/early.sorted -nt /var/lib/rpm/Packages ] || exit 0
-	fi
-	
-	# Check for > 384 MB
-	read label val rest  < /proc/meminfo 
-	[ "$rest" = "kB" -a $val -gt 393216 ] || exit 0
-
-	. /etc/init.d/functions
-
-	cmdline=$(cat /proc/cmdline)
-	strstr "$cmdline" autorelabel && exit 0
-	
-	if [ -f  /.autorelabel ]; then  	
-		# Check SELinux status
-		selinuxfs="$(fstab_decode_str `LC_ALL=C awk '/ selinuxfs / { print $2 }' /proc/mounts`)"
-		SELINUX_STATE=
-		if [ -n "$selinuxfs" ] && [ "`cat /proc/self/attr/current`" != "kernel" ]; then
-		    if [ -r "$selinuxfs/enforce" ] ; then
-			SELINUX_STATE=`cat "$selinuxfs/enforce"`
-		    else
-	                # assume enforcing if you can't read it
-	                SELINUX_STATE=1
-	            fi
-		fi
-	
-		if [ -n "$SELINUX_STATE" ]; then
-			exit 0
-		fi
-	fi
-
-	
-	try=0
-	while [ $try -lt 10 ]; do
-		if test -d /usr/sbin; then
-			try=10
-		else
-			try=$[$try+1]
-			sleep 1
-		fi
-	done
-	exec /sbin/readahead --dont-sort /var/lib/readahead/early.sorted
-end script
-


Index: readahead.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/devel/readahead.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- readahead.spec	13 Oct 2009 10:56:55 -0000	1.62
+++ readahead.spec	28 Jan 2010 12:11:24 -0000	1.63
@@ -1,11 +1,12 @@
 Summary:        Read a preset list of files into memory
 Name:           readahead
 Version:        1.5.4
-Release:        1%{?dist}
+Release:        3%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
 Source0:        readahead-%{version}.tar.bz2
+Patch1: 	readahead-upstart-0.6.patch
 
 URL: 		https://fedorahosted.org/readahead/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,6 +27,8 @@ needed. Its goal is to speed up the boot
 
 %prep
 %setup -q
+%patch1 -p1 
+autoreconf
 
 %build
 %configure --sbindir=/sbin
@@ -60,14 +63,22 @@ fi
 %{_sysconfdir}/cron.monthly/readahead-monthly.cron
 %config %{_sysconfdir}/readahead.conf
 %dir %{pkgvardatadir}
-%{_sysconfdir}/event.d/readahead-collector.event
-%{_sysconfdir}/event.d/readahead-disable-services.event
-%{_sysconfdir}/event.d/readahead.event
+%{_sysconfdir}/init/readahead-collector.conf
+%{_sysconfdir}/init/readahead-disable-services.conf
+%{_sysconfdir}/init/readahead.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/readahead
 /sbin/readahead
 /sbin/readahead-collector
 
 %changelog
+* Fri Jan 15 2010 Harald Hoyer <harald at redhat.com> 1.5.4-3
+- update for upstart-0.6
+- Related: rhbz#543948
+
+* Wed Jan 13 2010 Harald Hoyer <harald at redhat.com> 1.5.4-2
+- rebuild for libaudit soname bump
+- Related: rhbz#543948
+
 * Tue Oct 13 2009 Harald Hoyer <harald at redhat.com> 1.5.4-1
 - cleanup readahead-collector audit rules
 - translation update

More information about the scm-commits mailing list