Hello community, here is the log from the commit of package autofs checked in at Tue Mar 6 19:08:44 CET 2007. -------- --- autofs/autofs.changes 2007-01-31 15:43:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/autofs/autofs.changes 2007-03-06 12:12:21.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Mar 6 12:12:02 CET 2007 - mkoenig@suse.de + +- Fix last upstream patch which introduced a problem for + filesystems defined in fstab by LABEL or UUID [#244945] +- Fix killing of processes on stop [#249770] + +------------------------------------------------------------------- New: ---- autofs-4.1.4-fix_contained_check.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.spec ++++++ --- /var/tmp/diff_new_pack.C24499/_old 2007-03-06 19:08:37.000000000 +0100 +++ /var/tmp/diff_new_pack.C24499/_new 2007-03-06 19:08:37.000000000 +0100 @@ -19,7 +19,7 @@ Autoreqprov: on Requires: sed grep Version: 4.1.4 -Release: 62 +Release: 66 Summary: A Kernel-Based Automounter BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/autofs-%{version}.tar.bz2 @@ -43,6 +43,7 @@ Patch13: autofs-4.1.4-buffer_overflow.patch Patch14: autofs-4.1.4-multi_parse_fix.patch Patch15: autofs-4.1.4-dont_create_remote_dirs.patch +Patch16: autofs-4.1.4-fix_contained_check.patch PreReq: %fillup_prereq %insserv_prereq PreReq: /usr/bin/sed /usr/bin/grep /bin/mv @@ -79,6 +80,7 @@ %patch13 %patch14 -p1 %patch15 -p1 +%patch16 -p1 %build autoconf @@ -144,7 +146,11 @@ %{_mandir}/man8/* /usr/sbin/automount -%changelog -n autofs +%changelog +* Tue Mar 06 2007 - mkoenig@suse.de +- Fix last upstream patch which introduced a problem for + filesystems defined in fstab by LABEL or UUID [#244945] +- Fix killing of processes on stop [#249770] * Wed Jan 31 2007 - mkoenig@suse.de - add upstream patch autofs-4.1.4-dont_create_remote_dirs.patch Checks first for the directory to create in order to avoid ++++++ autofs-4.1.4-fix_contained_check.patch ++++++ Index: autofs-4.1.4/lib/mounts.c =================================================================== --- autofs-4.1.4.orig/lib/mounts.c +++ autofs-4.1.4/lib/mounts.c @@ -315,7 +315,9 @@ int contained_in_local_fs(const char *pa ret = 1; } else ret = 1; - } + } else if (!strncmp("LABEL=", this->fs_name, 6) || + !strncmp("UUID=", this->fs_name, 5)) + ret = 1; break; } } ++++++ autofs4-init.diff ++++++ --- /var/tmp/diff_new_pack.C24499/_old 2007-03-06 19:08:37.000000000 +0100 +++ /var/tmp/diff_new_pack.C24499/_new 2007-03-06 19:08:37.000000000 +0100 @@ -1,4 +1,6 @@ ---- samples/rc.autofs.in +Index: samples/rc.autofs.in +=================================================================== +--- samples/rc.autofs.in.orig +++ samples/rc.autofs.in @@ -1,67 +1,35 @@ #!/bin/bash @@ -84,7 +86,7 @@ # # We can add local options here -@@ -71,323 +39,189 @@ +@@ -71,323 +39,189 @@ localoptions='' # # Daemon options @@ -546,7 +548,7 @@ if kill -0 $i 2> /dev/null; then return 0 fi -@@ -396,381 +230,156 @@ +@@ -396,381 +230,156 @@ function alive() return 1 } @@ -596,7 +598,7 @@ + case "$mount_type" in + automount*) + { -+ kill $SIG $(fuser -m $path/* | cut -d : -f 2- | sed 's#[^0-9 ]##g') ++ fuser -mk $SIG $path/* + } > /dev/null 2>&1 + ;; + esac ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org