[arch-commits] Commit in autofs/repos (7 files)
Andrea Scarpino
andrea at archlinux.org
Sun Apr 26 19:00:46 UTC 2009
Date: Sunday, April 26, 2009 @ 15:00:46
Author: andrea
Revision: 36638
Merged revisions 36637 via svnmerge from
svn+ssh://archlinux.org/srv/svn-packages/autofs/trunk
........
r36637 | andrea | 2009-04-26 21:00:27 +0200 (Sun, 26 Apr 2009) | 1 line
upgpkg: autofs 5.0.4-4
........
Added:
autofs/repos/extra-i686/autofs.install
(from rev 36637, autofs/trunk/autofs.install)
Modified:
autofs/repos/extra-i686/ (properties)
autofs/repos/extra-i686/PKGBUILD
autofs/repos/extra-i686/auto.master
autofs/repos/extra-i686/autofs
autofs/repos/extra-i686/autofs.conf.d
Deleted:
autofs/repos/extra-i686/auto.net
----------------+
PKGBUILD | 14 +++++++-------
auto.master | 1 -
auto.net | 29 -----------------------------
autofs | 4 ++--
autofs.conf.d | 3 +--
autofs.install | 5 +++++
6 files changed, 15 insertions(+), 41 deletions(-)
Property changes on: autofs/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /autofs/trunk:1-36620
+ /autofs/trunk:1-36637
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-04-26 19:00:27 UTC (rev 36637)
+++ extra-i686/PKGBUILD 2009-04-26 19:00:46 UTC (rev 36638)
@@ -5,21 +5,22 @@
pkgname=autofs
pkgver=5.0.4
-pkgrel=3
+pkgrel=4
pkgdesc="A kernel-based automounter for Linux."
arch=('i686' 'x86_64')
url="http://wiki.autofs.net/FrontPage"
license=('GPL2')
depends=('libldap' 'libxml2' 'heimdal')
backup=(etc/autofs/auto.master etc/autofs/auto.misc etc/conf.d/autofs)
+install=autofs.install
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')
+ 'autofs' 'autofs.conf.d' 'auto.master' 'auto.misc'
+ 'heimdal.patch')
md5sums=('2646dde61edd08dd952255558c733c08'
- '7c91067f29b9c3c608e890505acbca88'
- 'ddd69346754419faee15fc4c7edeb8b8'
- '036bb5731400b7b0a89797e949169734'
+ 'b4984b3161f50cba3d189b0ec594d014'
+ '47f597c870410055e0fdb66103daf928'
+ 'a6cefb591e77b31b79dbb7243646c96b'
'd8a15ec9186c5c0b36e5cea1e2739e8a'
- 'e4d945d63abc0488a47a5e2a750e8c3b'
'1ee4825e26ad72bfe86acec3d3da5d2a')
build() {
@@ -41,7 +42,6 @@
install -D -m 644 ${srcdir}/$conf_file ${pkgdir}/etc/autofs/$conf_file
done
- install -m 755 ${srcdir}/auto.net ${pkgdir}/etc/autofs/auto.net
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: extra-i686/auto.master
===================================================================
--- extra-i686/auto.master 2009-04-26 19:00:27 UTC (rev 36637)
+++ extra-i686/auto.master 2009-04-26 19:00:46 UTC (rev 36638)
@@ -3,4 +3,4 @@
# mountpoint map options
# For details of the format look at autofs(5).
-/media /etc/autofs/auto.media
\ No newline at end of file
+#/media /etc/autofs/auto.media
Deleted: extra-i686/auto.net
===================================================================
--- extra-i686/auto.net 2009-04-26 19:00:27 UTC (rev 36637)
+++ extra-i686/auto.net 2009-04-26 19:00:46 UTC (rev 36638)
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# $Id: auto.net,v 1.1 2003/11/15 15:40:14 manolis Exp $
-
-# Look at what a host is exporting to determine what we can mount.
-# This is very simple, but it appears to work surprisingly well
-
-key="$1"
-
-# add "nosymlink" here if you want to suppress symlinking local filesystems
-# Note: "nonstrict" is now set by default, remove it if you don't want it.
-opts="-fstype=nfs,hard,intr,nodev,nosuid,nonstrict"
-
-# Showmount comes in a number of names and varieties. "showmount" is
-# typically an older version which accepts the '--no-headers' flag
-# but ignores it. "kshowmount" is the newer version installed with knfsd,
-# which both accepts and acts on the '--no-headers' flag.
-#SHOWMOUNT="kshowmount --no-headers -e $key"
-#SHOWMOUNT="showmount -e $key | tail +2"
-
-# Newer distributions get this right
-SHOWMOUNT="/usr/sbin/showmount --no-headers -e $key"
-
-$SHOWMOUNT | LC_ALL=C sort +0 | \
- awk -v key="$key" -v opts="$opts" -- '
- BEGIN { ORS=""; first=1 }
- { if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 }
- END { if (!first) print "\n"; else exit 1 }
- '
Modified: extra-i686/autofs
===================================================================
--- extra-i686/autofs 2009-04-26 19:00:27 UTC (rev 36637)
+++ extra-i686/autofs 2009-04-26 19:00:46 UTC (rev 36638)
@@ -14,7 +14,7 @@
case "$1" in
start)
stat_busy "Starting Automounter"
- [ -z "$PID" ] && /usr/sbin/automount $daemonoptions &> /dev/null &
+ [ -z "$PID" ] && /usr/sbin/automount $daemonoptions &> /dev/null
if [ $? -gt 0 ]; then
stat_fail
else
@@ -24,7 +24,7 @@
;;
stop)
stat_busy "Stopping Automounter"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
if [ $? -gt 0 ]; then
stat_fail
else
Modified: extra-i686/autofs.conf.d
===================================================================
--- extra-i686/autofs.conf.d 2009-04-26 19:00:27 UTC (rev 36637)
+++ extra-i686/autofs.conf.d 2009-04-26 19:00:46 UTC (rev 36638)
@@ -1,5 +1,4 @@
-# e.g. localoptions='rsize=8192,wsize=8192'
-localoptions=''
+#localoptions='rsize=8192,wsize=8192'
# e.g. --timeout=60
daemonoptions=''
Copied: autofs/repos/extra-i686/autofs.install (from rev 36637, autofs/trunk/autofs.install)
===================================================================
--- extra-i686/autofs.install (rev 0)
+++ extra-i686/autofs.install 2009-04-26 19:00:46 UTC (rev 36638)
@@ -0,0 +1,5 @@
+post_install(){
+ echo "########################################################"
+ echo "In autofs5 --ghost option isn't valid. In order to start"
+ echo "autofs you must remove it from your /etc/conf.d/autofs. "
+}
More information about the arch-commits
mailing list