Hello community,
here is the log from the commit of package autofs
checked in at Fri Oct 6 17:21:36 CEST 2006.
--------
--- autofs/autofs.changes 2006-09-12 15:08:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/autofs/autofs.changes 2006-10-04 16:59:08.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Oct 4 16:35:36 CEST 2006 - jeffm@suse.com
+
+- Fixed nfs mount connect retry fallback (195924)
+- Fixed e2fsck error handling (196057)
+
+-------------------------------------------------------------------
New:
----
autofs4-e2fsck-error-handling.diff
autofs4-nfs-retry.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autofs.spec ++++++
--- /var/tmp/diff_new_pack.yJPzU2/_old 2006-10-06 17:21:16.000000000 +0200
+++ /var/tmp/diff_new_pack.yJPzU2/_new 2006-10-06 17:21:16.000000000 +0200
@@ -19,7 +19,7 @@
Autoreqprov: on
Requires: sed grep
Version: 4.1.4
-Release: 34
+Release: 38
Summary: A Kernel-Based Automounter
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/autofs-%{version}.tar.bz2
@@ -38,6 +38,8 @@
Patch8: autofs-4.1.4-strip.patch
Patch9: autofs-4.1.4-configurable-locking.patch
Patch10: autofs4-net-multi.patch
+Patch11: autofs4-e2fsck-error-handling.diff
+Patch12: autofs4-nfs-retry.diff
PreReq: %fillup_prereq %insserv_prereq
PreReq: /usr/bin/sed /usr/bin/grep /bin/mv
@@ -70,6 +72,8 @@
%patch8
%patch9 -p1
%patch10 -p1
+%patch11 -p1
+%patch12 -p1
%build
autoconf
@@ -131,6 +135,9 @@
/usr/sbin/automount
%changelog -n autofs
+* Wed Oct 04 2006 - jeffm@suse.com
+- Fixed nfs mount connect retry fallback (195924)
+- Fixed e2fsck error handling (196057)
* Tue Sep 12 2006 - schwab@suse.de
- Clean up init script.
* Tue Sep 12 2006 - ro@suse.de
++++++ autofs4-e2fsck-error-handling.diff ++++++
diff -ruN autofs-4.1.4/modules/mount_ext2.c autofs-4.1.4.devel/modules/mount_ext2.c
--- autofs-4.1.4/modules/mount_ext2.c 2005-01-10 08:28:29.000000000 -0500
+++ autofs-4.1.4.devel/modules/mount_ext2.c 2006-09-07 16:10:22.000000000 -0400
@@ -99,7 +99,13 @@
err = spawnl(LOG_DEBUG, fsck_prog, fsck_prog, "-p", what, NULL);
}
- if (err & ~6) {
+ /*
+ * spawnl returns the error code, left shifted by 8 bits. We are
+ * interested in the following error bits from the fsck program:
+ * 2 - File system errors corrected, system should be rebooted
+ * 4 - File system errors left uncorrected
+ */
+ if ((err >> 8) & 6) {
error(MODPREFIX "%s: filesystem needs repair, won't mount",
what);
return 1;
++++++ autofs4-nfs-retry.diff ++++++
From: Jeff Mahoney