[Initng-svn] r3631 - initng-ifiles/trunk/initfiles/system

[svn at initng.thinktux.net]

Author: jimmy
Date: Sun Apr  2 22:48:43 2006
New Revision: 3631

Added:
   initng-ifiles/trunk/initfiles/system/readahead-desktop.ii
      - copied, changed from r3625, initng-ifiles/trunk/initfiles/system/readahead.ii
Modified:
   initng-ifiles/trunk/initfiles/system/Makefile.am
   initng-ifiles/trunk/initfiles/system/readahead.ii
Log:
Some work on readahead, *untested*


Modified: initng-ifiles/trunk/initfiles/system/Makefile.am
==============================================================================
--- initng-ifiles/trunk/initfiles/system/Makefile.am	(original)
+++ initng-ifiles/trunk/initfiles/system/Makefile.am	Sun Apr  2 22:48:43 2006
@@ -43,6 +43,7 @@
 	numlock.ii \
 	pcmcia.ii \
 	readahead.ii \
+	readahead-desktop.ii \
 	rmnologin.ii \
 	serial.ii \
 	speedstep.ii \

Copied: initng-ifiles/trunk/initfiles/system/readahead-desktop.ii (from r3625, initng-ifiles/trunk/initfiles/system/readahead.ii)
==============================================================================
--- initng-ifiles/trunk/initfiles/system/readahead.ii	(original)
+++ initng-ifiles/trunk/initfiles/system/readahead-desktop.ii	Sun Apr  2 22:48:43 2006
@@ -1,18 +1,21 @@
-service system/readahead {
-	need = system/initial/mountvirtfs;
+service system/readahead-desktop {
+	need = system/initial/mountvirtfs system/readahead system/mountfs;
 #ifd debian
-	exec start = @/usr/sbin/readahead-list@ /etc/readahead/readahead;
-	script stop = {
-		@/usr/bin/filelist-order@ /etc/readahead/readahead > /etc/readahead/readahead.new
-		@mv@ -f /etc/readahead/readahead.new /etc/readahead/readahead
-	};
-#elsed fedora
-	exec start = @/usr/sbin/readahead@ /etc/readahead.early.files;
-#elsed
 	script start = {
-		[ -e /etc/readahead/readahead.new ] && exec @readahead@ < /etc/readahead/readahead.new
-		[ -e /etc/readahead/readahead ] && exec @readahead@ < /etc/readahead/readahead
-		[ -e /etc/readahead ] && exec @readahead@ < /etc/readahead
+	
+	# Check if @/usr/sbin/readahead-list@ exits.
+	[ -x @/usr/sbin/readahead-list@ ] || exit 0
+	
+	
+	    
+	# The recent implention uses @/sbin/readhead-watch@ to get the list
+	if [ -e /etc/readahead/desktop ]
+	then
+	    exec @/sbin/readahead-list@ /etc/readahead/desktop
+	else
+	    # if the watcher exist, generate /etc/readahead/desktop
+	    [ -x @/sbin/readahead-watch@ ] && exec @/sbin/readahead-watch@ -o /etc/readahead/desktop /usr /var
+	fi
 	};
 #endd
 }

Modified: initng-ifiles/trunk/initfiles/system/readahead.ii
==============================================================================
--- initng-ifiles/trunk/initfiles/system/readahead.ii	(original)
+++ initng-ifiles/trunk/initfiles/system/readahead.ii	Sun Apr  2 22:48:43 2006
@@ -1,18 +1,38 @@
 service system/readahead {
 	need = system/initial/mountvirtfs;
+
 #ifd debian
-	exec start = @/usr/sbin/readahead-list@ /etc/readahead/readahead;
-	script stop = {
-		@/usr/bin/filelist-order@ /etc/readahead/readahead > /etc/readahead/readahead.new
-		@mv@ -f /etc/readahead/readahead.new /etc/readahead/readahead
-	};
-#elsed fedora
-	exec start = @/usr/sbin/readahead@ /etc/readahead.early.files;
-#elsed
 	script start = {
-		[ -e /etc/readahead/readahead.new ] && exec @readahead@ < /etc/readahead/readahead.new
-		[ -e /etc/readahead/readahead ] && exec @readahead@ < /etc/readahead/readahead
-		[ -e /etc/readahead ] && exec @readahead@ < /etc/readahead
+	
+	# Check if @/usr/sbin/readahead-list@ exits.
+	if [ -x @/usr/sbin/readahead-list@ ]
+	then
+	    
+	    # The recent implention uses @/sbin/readhead-watch@ to get the list
+	    if [ -e /etc/readahead/boot ]
+	    then
+		exec @/sbin/readahead-list@ /etc/readahead/boot
+	    else
+		# if the watcher exist, generate /etc/readahead/boot
+		[ -x @/sbin/readahead-watch@ ] && exec @/sbin/readahead-watch@ -o /etc/readahead/boot
+	    fi
+
+	    # This is the old location for readahead file
+	    if [ -e /etc/readahead/readahead ]
+	    then
+		exec @/usr/sbin/readahead-list@ /etc/readahead/readahead
+	    fi
+
+	fi
+	exit 0
 	};
+
+	
+	# Some old implention, uses filelist-order to oganize the readahead order.
+	#script stop = {
+	#	@/usr/bin/filelist-order@ /etc/readahead/readahead > /etc/readahead/readahead.new
+	#	@mv@ -f /etc/readahead/readahead.new /etc/readahead/readahead
+	#};
+
 #endd
 }