Hello community, here is the log from the commit of package autofs checked in at Mon Apr 21 18:31:41 CEST 2008. -------- --- autofs/autofs.changes 2008-01-30 09:25:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/autofs/autofs.changes 2008-04-21 17:11:51.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 21 17:10:26 CEST 2008 - mkoenig@suse.de + +- improve shutdown in init script + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.spec ++++++ --- /var/tmp/diff_new_pack.AD3880/_old 2008-04-21 18:31:16.000000000 +0200 +++ /var/tmp/diff_new_pack.AD3880/_new 2008-04-21 18:31:16.000000000 +0200 @@ -10,6 +10,7 @@ # norootforbuild + Name: autofs Url: http://www.kernel.org/pub/linux/daemons/autofs/v5/ BuildRequires: bison e2fsprogs flex krb5-devel libxml2-devel module-init-tools nfs-client openldap2-devel @@ -18,7 +19,7 @@ AutoReqProv: on Requires: grep Version: 5.0.3 -Release: 6 +Release: 27 Summary: A Kernel-Based Automounter BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}.tar.bz2 @@ -149,6 +150,8 @@ /usr/sbin/automount %changelog +* Mon Apr 21 2008 mkoenig@suse.de +- improve shutdown in init script * Wed Jan 30 2008 mkoenig@suse.de - link LDAP lookup module with krb5 if build with SASL [bnc#356599] * Thu Jan 17 2008 mkoenig@suse.de @@ -305,7 +308,7 @@ - use our good old init script (bug #67311) * Fri Mar 04 2005 arvin@suse.de - fixed syntax of sysconfig.autofs (bug #70883) -* Fri Feb 25 2005 mmj@suse.de +* Sat Feb 26 2005 mmj@suse.de - LSB says return value for not running service is 7 [#65817] * Thu Dec 09 2004 ihno@suse.de - Update to version 4.1.3 plus patches ++++++ autofs-suse-autofs_init.patch ++++++ --- /var/tmp/diff_new_pack.AD3880/_old 2008-04-21 18:31:16.000000000 +0200 +++ /var/tmp/diff_new_pack.AD3880/_new 2008-04-21 18:31:16.000000000 +0200 @@ -1,8 +1,8 @@ -Index: autofs-5.0.2/samples/rc.autofs.in +Index: autofs-5.0.3/samples/rc.autofs.in =================================================================== ---- autofs-5.0.2.orig/samples/rc.autofs.in -+++ autofs-5.0.2/samples/rc.autofs.in -@@ -2,116 +2,152 @@ +--- autofs-5.0.3.orig/samples/rc.autofs.in ++++ autofs-5.0.3/samples/rc.autofs.in +@@ -2,116 +2,148 @@ # # rc file for automount using a Sun-style "master map". # @@ -104,15 +104,17 @@ - RETVAL=$? - [ $RETVAL = 0 -a -z "`pidof $DAEMON`" ] || sleep 3 - count=`expr $count + 1` -+ declare -i count=0 + case "$RUNLEVEL" in -+ 0|6|s|S) ++ [016sS]) + for sig in TERM KILL ; do -+ while read type path fs rest ; do -+ case "$fs" in -+ autofs) -+ /bin/fuser -k -$sig -m $path/* >/dev/null 2>&1 -+ esac ++ while read type mnt fs rest ; do ++ test "$fs" = autofs || continue ++ for path in $mnt/* ; do ++ # skip ghost dirs ++ test "`stat -f -c '%t' $path`" = "187" && continue ++ test -e $path || continue ++ /bin/fuser -k -$sig -m $path > /dev/null 2>&1 ++ done + done < /proc/mounts + [ $sig = TERM ] && sleep 2 done @@ -123,21 +125,12 @@ - fi - return $RETVAL -} -+ /sbin/killproc -USR2 $DAEMON -+ esac -+ while [ $count -lt 15 ] ; do -+ /sbin/killproc -t3 -TERM $DAEMON -+ RETVAL=$? -+ [ $RETVAL -eq 1 ] || break -+ : $((count++)) -+ done - +- -function restart() { - stop - start -+ return $RETVAL - } - +-} +- -function reload() { - pid=`pidof $DAEMON` - if [ -z $pid ]; then @@ -149,7 +142,12 @@ - RETVAL=0 - fi - return $RETVAL --} ++ /sbin/killproc -USR2 $DAEMON ++ sleep 2 ++ esac ++ /sbin/killproc -G -TERM $DAEMON ++ return $RETVAL + } RETVAL=0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org