[arch-commits] Commit in autofs/repos (3 files)

[Giovanni Scafora]

    Date: Saturday, January 17, 2009 @ 12:31:07
  Author: giovanni
Revision: 24468

Merged revisions 24091 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/autofs/trunk

........
  r24091 | andrea | 2009-01-13 00:28:15 -0800 (mar, 13 gen 2009) | 1 line
  
  upgpkg: autofs 5.0.4-2
........

Modified:
  autofs/repos/testing-x86_64/	(properties)
  autofs/repos/testing-x86_64/PKGBUILD
  autofs/repos/testing-x86_64/autofs

----------+
 PKGBUILD |    6 +++---
 autofs   |   13 +++++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)


Property changes on: autofs/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /autofs/trunk:1-23848
   + /autofs/trunk:1-24467

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-01-17 17:27:10 UTC (rev 24467)
+++ testing-x86_64/PKGBUILD	2009-01-17 17:31:07 UTC (rev 24468)
@@ -5,7 +5,7 @@
 
 pkgname=autofs
 pkgver=5.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A kernel-based automounter for Linux."
 arch=('i686' 'x86_64')
 url="http://wiki.autofs.net/FrontPage"
@@ -15,7 +15,7 @@
 source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2"
 	'autofs' 'autofs.conf.d' 'auto.master' 'auto.misc' 'auto.net' 'heimdal.patch')
 md5sums=('2646dde61edd08dd952255558c733c08'
-         '6febd98b29bb83d7bc8dbd3ea953e698'
+         'e857b28b8a660602d349a5e21edab9f0'
          'ddd69346754419faee15fc4c7edeb8b8'
          '036bb5731400b7b0a89797e949169734'
          'd8a15ec9186c5c0b36e5cea1e2739e8a'
@@ -41,7 +41,7 @@
   done
 
   install -m 755 ${srcdir}/auto.net ${pkgdir}/etc/autofs/auto.net
-  sed -i "s:/etc:/etc/autofs:g" ${pkgdir}/usr/man/man5/auto.master.5
+  sed -i "s:/etc:/etc/autofs:g" ${pkgdir}/usr/share/man/man5/auto.master.5
   install -D -m 755 ${srcdir}/autofs ${pkgdir}/etc/rc.d/autofs
   install -D -m 644 ${srcdir}/autofs.conf.d ${pkgdir}/etc/conf.d/autofs
 }

Modified: testing-x86_64/autofs
===================================================================
--- testing-x86_64/autofs	2009-01-17 17:27:10 UTC (rev 24467)
+++ testing-x86_64/autofs	2009-01-17 17:31:07 UTC (rev 24468)
@@ -3,15 +3,21 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /usr/bin/automuonter`
+# source application-specific settings
+[ -f /etc/conf.d/autofs ] && . /etc/conf.d/autofs
+
+if [ ! -z "$TIMEOUT" ]; then
+  daemonoptions="--timeout=$TIMEOUT $daemonoptions"
+fi
+
+PID=`cat /var/run/autofs-running &> /dev/null`
 case "$1" in
   start)
     stat_busy "Starting Automounter"
-    [ -z "$PID" ] && /usr/bin/automuonter &> /dev/null &
+    [ -z "$PID" ] && /usr/sbin/automount $daemonoptions &> /dev/null &
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      echo $PID > /var/run/autofs.pid
       add_daemon autofs
       stat_done
     fi
@@ -22,7 +28,6 @@
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      rm -f /var/run/autofs.pid
       rm_daemon autofs
       stat_done
     fi