rpms/readahead/devel readahead-1.4.5-usr.patch, NONE, 1.1 readahead.spec, 1.46, 1.47

[Harald Hoyer]

Author: harald

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

Modified Files:
	readahead.spec 
Added Files:
	readahead-1.4.5-usr.patch 
Log Message:
* Mon Sep 01 2008 Harald Hoyer <harald at redhat.com> 1.4.5-2
- moved readahead to /sbin (bug #460715)


readahead-1.4.5-usr.patch:

--- NEW FILE readahead-1.4.5-usr.patch ---
diff -up readahead-1.4.5/scripts/readahead.cron.usr readahead-1.4.5/scripts/readahead.cron
--- readahead-1.4.5/scripts/readahead.cron.usr	2008-08-14 08:04:26.000000000 +0200
+++ readahead-1.4.5/scripts/readahead.cron	2008-09-01 16:35:52.000000000 +0200
@@ -11,7 +11,7 @@ renice +19 -p $$ >/dev/null 2>&1
 ionice -c3 -p $$ >/dev/null 2>&1
 
 TYPES="early later"
-READAHEAD_CMD="/usr/sbin/readahead"
+READAHEAD_CMD="/sbin/readahead"
 READAHEAD_BASE="/etc/readahead.d"
 
 for LTYPE in $TYPES; do
diff -up readahead-1.4.5/scripts/readahead.event.usr readahead-1.4.5/scripts/readahead.event
--- readahead-1.4.5/scripts/readahead.event.usr	2008-08-14 08:04:21.000000000 +0200
+++ readahead-1.4.5/scripts/readahead.event	2008-09-01 16:39:22.000000000 +0200
@@ -11,7 +11,16 @@ console output
 script
 	. /etc/sysconfig/readahead
 	[ "$READAHEAD" != "yes" ] && exit 0
-	exec /usr/sbin/readahead --dont-sort /etc/readahead.d/early.sorted
+	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 /etc/readahead.d/early.sorted
 end script
 
 


Index: readahead.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/devel/readahead.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- readahead.spec	28 Aug 2008 10:03:07 -0000	1.46
+++ readahead.spec	1 Sep 2008 14:41:20 -0000	1.47
@@ -1,13 +1,14 @@
 Summary:        Read a preset list of files into memory
 Name:           readahead
 Version:        1.4.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
 Source0:        readahead-%{version}.tar.bz2
 Source1:        default.early
 Source2:        default.later
+Patch: 		readahead-1.4.5-usr.patch
 
 URL:            https://hosted.fedoraproject.org/projects/readahead
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,6 +26,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .usr
 cp -f -t ./lists/ %{SOURCE1}
 cp -f -t ./lists/ %{SOURCE2}
 
@@ -40,6 +42,8 @@
 # remove default lists
 rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/readahead.d/default.*
 
+mv ${RPM_BUILD_ROOT}/%{_sbindir}/readahead ${RPM_BUILD_ROOT}//sbin/readahead
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -67,10 +71,13 @@
 %{_sysconfdir}/event.d/readahead-disable-services.event
 %{_sysconfdir}/event.d/readahead.event
 %{_sysconfdir}/sysconfig/readahead
-%{_sbindir}/readahead
+/sbin/readahead
 /sbin/readahead-collector
 
 %changelog
+* Mon Sep 01 2008 Harald Hoyer <harald at redhat.com> 1.4.5-2
+- moved readahead to /sbin (bug #460715)
+
 * Thu Aug 28 2008 Harald Hoyer <harald at redhat.com> 1.4.5-1
 - new adaptive readahead version