Hello community, here is the log from the commit of package autofs checked in at Tue Jul 8 16:07:52 CEST 2008. -------- --- autofs/autofs.changes 2008-05-16 17:37:26.000000000 +0200 +++ autofs/autofs.changes 2008-06-26 17:01:23.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Jun 26 16:59:17 CEST 2008 - mkoenig@suse.de + +- update upstream patches 20080528 +- allow rootfs to be non-local [bnc#399944] +- remove patch + autofs-5.0.3-aclocal_pthread.patch + +------------------------------------------------------------------- Old: ---- autofs-5.0.3-aclocal_pthread.patch autofs-5.0.3-upstream-patches-20080117 New: ---- autofs-5.0.3-allow_rootfs_nonlocal.patch autofs-5.0.3-upstream-patches-20080528 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.spec ++++++ --- /var/tmp/diff_new_pack.Oa8895/_old 2008-07-08 16:02:04.000000000 +0200 +++ /var/tmp/diff_new_pack.Oa8895/_new 2008-07-08 16:02:04.000000000 +0200 @@ -17,9 +17,8 @@ License: GPL v2 or later Group: System/Daemons AutoReqProv: on -Requires: grep Version: 5.0.3 -Release: 36 +Release: 46 Summary: A Kernel-Based Automounter BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}.tar.bz2 @@ -28,13 +27,13 @@ Source4: README.SuSE.ldap Source5: README.SuSE Source7: NetworkManager-autofs -Patch0: autofs-5.0.3-upstream-patches-20080117 +Patch0: autofs-5.0.3-upstream-patches-20080528 Patch10: autofs-suse-auto_master_default.patch Patch11: autofs-suse-autofs_init.patch Patch12: autofs-5.0.1-mount_xdr_no_strict_aliasing.patch Patch13: autofs-5.0.2-use_local_cflags.patch -Patch14: autofs-5.0.3-aclocal_pthread.patch Patch15: autofs-5.0.3-link_kerberos.patch +Patch16: autofs-5.0.3-allow_rootfs_nonlocal.patch PreReq: %fillup_prereq %insserv_prereq %if %suse_version > 1020 Recommends: nfs-client @@ -65,8 +64,8 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 -%patch14 -p1 %patch15 -p1 +%patch16 -p1 %build autoconf -f @@ -150,6 +149,11 @@ /usr/sbin/automount %changelog +* Thu Jun 26 2008 mkoenig@suse.de +- update upstream patches 20080528 +- allow rootfs to be non-local [bnc#399944] +- remove patch + autofs-5.0.3-aclocal_pthread.patch * Fri May 16 2008 mkoenig@suse.de - more shutdown improvements to minimize the risk of mounted leftovers in the shutdown process ++++++ autofs-5.0.3-allow_rootfs_nonlocal.patch ++++++ Index: autofs-5.0.3/lib/mounts.c =================================================================== --- autofs-5.0.3.orig/lib/mounts.c 2008-06-13 14:30:01.000000000 +0200 +++ autofs-5.0.3/lib/mounts.c 2008-06-16 11:38:16.000000000 +0200 @@ -363,6 +363,10 @@ int contained_in_local_fs(const char *pa if (!strncmp(path, this->path, len)) { if (len > 1 && pathlen > len && path[len] != '/') continue; + else if (len == 1 && this->path[0] == '/') + /* alway return true on rootfs, we don't care + * here if it is local */ + ret = 1; else if (this->fs_name[0] == '/') { if (strlen(this->fs_name) > 1) { if (this->fs_name[1] != '/') ++++++ autofs-5.0.3-upstream-patches-20080117 -> autofs-5.0.3-upstream-patches-20080528 ++++++ ++++ 1808 lines (skipped) ++++ between autofs/autofs-5.0.3-upstream-patches-20080117 ++++ and autofs/autofs-5.0.3-upstream-patches-20080528 ++++++ autofs-suse-autofs_init.patch ++++++ --- /var/tmp/diff_new_pack.Oa8895/_old 2008-07-08 16:02:05.000000000 +0200 +++ /var/tmp/diff_new_pack.Oa8895/_new 2008-07-08 16:02:05.000000000 +0200 @@ -1,8 +1,8 @@ Index: autofs-5.0.3/samples/rc.autofs.in =================================================================== ---- autofs-5.0.3.orig/samples/rc.autofs.in -+++ autofs-5.0.3/samples/rc.autofs.in -@@ -2,116 +2,187 @@ +--- autofs-5.0.3.orig/samples/rc.autofs.in 2008-01-14 05:39:16.000000000 +0100 ++++ autofs-5.0.3/samples/rc.autofs.in 2008-06-26 17:03:39.000000000 +0200 +@@ -2,116 +2,188 @@ # # rc file for automount using a Sun-style "master map". # @@ -15,9 +15,10 @@ +# Required-Start: $network $syslog $remote_fs +# Should-Start: $portmap ypbind keyserv ldap gssd +# Required-Stop: -+# Should-Stop: ++# Should-Stop: +# Default-Start: 3 5 +# Default-Stop: ++# Short-Description: automatic mounting of filesystems +# Description: Start the autofs daemon for automatic mounting of filesystems. +### END INIT INFO ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org