File bootfaster.diff of Package preload
--- /etc/init.d/halt 2008-12-05 12:25:45.000000000 +0100
+++ /tmp/r2//etc/init.d/halt 2009-01-24 19:39:38.000000000 +0100
@@ -178,8 +178,26 @@
# on umsdos fs this would lead to an error message, so direct errors to
# /dev/null
+set -x
+
mount -no remount,ro / 2> /dev/null
sync
+if test -s /var/run/lastblks; then
+ ROOT_IS_EXT3=
+ while read where what type options rest ; do
+ case "$where" in
+ \#*|"") ;;
+ *) if test "$type" = "ext3" -a "$what" = "/"; then
+ ROOT_IS_EXT3=$where
+ break
+ fi ;;
+ esac
+ done < /etc/fstab
+ if test -n "$ROOT_IS_EXT3"; then
+ chvt 1
+ #e2remapblocks /var/run/blksmapped "$ROOT_IS_EXT3"
+ fi
+fi
# stop any inactive software raid
if test -n "$mddev" ; then
--- /etc/insserv.conf.orig 2009-01-10 07:43:17.000000000 +0100
+++ /etc/insserv.conf 2009-01-20 10:21:26.000000000 +0100
@@ -18,7 +18,7 @@
# be remote. Most applications that care will probably require
# both $local_fs and $remote_fs)
#
-$remote_fs $local_fs +nfs +smbfs
+$remote_fs $local_fs +nfs +smbfs +waitfornm
#
# System logger is operational
--- /lib/mkinitrd/scripts/boot-mount.sh 2009-01-23 11:31:30.000000000 +0100
+++ .//lib/mkinitrd/scripts/boot-mount.sh 2009-02-03 21:44:06.000000000 +0100
@@ -142,6 +142,7 @@
[ -n "$rootfstype" ] && opt="${opt} -t $rootfstype"
echo mount $opt $rootdev /root
+oldrootfsopts=$opt
mount $opt $rootdev /root
if [ $? -ne 0 ] ; then
echo "could not mount root filesystem -- exiting to /bin/sh"
--- /lib/mkinitrd/scripts/boot-remount.sh 2009-01-23 11:31:30.000000000 +0100
+++ ./lib/mkinitrd/scripts/boot-remount.sh 2009-02-03 21:44:06.000000000 +0100
@@ -61,6 +61,7 @@
shift
done
if [ "$fsoptions" ] ; then
- mount -o remount,$fsoptions $rootdev /root
+ echo "remount -$fsoptions- -$oldrootfsopts-"
+ #mount -o remount,$fsoptions $rootdev /root
fi
fi
--- /lib/mkinitrd/scripts/setup-storage.sh 2009-01-23 11:31:30.000000000 +0100
+++ ./lib/mkinitrd/scripts/setup-storage.sh 2009-02-03 21:44:06.000000000 +0100
@@ -350,6 +350,7 @@
fallback_rootdev="$rootdev"
save_var fallback_rootdev
save_var rootdev
+save_var rootfstype
save_var resumedev
save_var journaldev
save_var dumpdev
--- boot.localfs.orig 2009-03-26 08:04:50.916224414 +0100
+++ boot.localfs 2009-03-26 08:06:36.857222421 +0100
@@ -161,12 +161,15 @@
else
FSCK_OPTS="$FSCK_OPTS -V"
fi
+ preload=$(pidof preload)
+ test -n "$preload" && kill -STOP $preload
echo "Checking file systems..."
fsck $FSCK_OPTS
# A return code of 1 indicates that file system errors
# were corrected, but that the boot may proceed.
# A return code of 2 or larger indicates failure.
FSCK_RETURN=$?
+ test -n "$preload" && kill -CONT $preload
test $FSCK_RETURN -lt 4
rc_status -v1 -r
if test $FSCK_RETURN -gt 1 -a $FSCK_RETURN -lt 4 ; then