diff options
author | Alec Warner <antarus@gentoo.org> | 2006-05-30 15:00:50 +0000 |
---|---|---|
committer | Alec Warner <antarus@gentoo.org> | 2006-05-30 15:00:50 +0000 |
commit | 6d604691177a1cf3599f6bd71f62816f0fc3f15d (patch) | |
tree | 5a039a06c833b65a56e808f46c71e5ce48a71cc0 /net-fs | |
parent | Install sample LDAP and/or SQL config files based on USE flags. (diff) | |
download | gentoo-2-6d604691177a1cf3599f6bd71f62816f0fc3f15d.tar.gz gentoo-2-6d604691177a1cf3599f6bd71f62816f0fc3f15d.tar.bz2 gentoo-2-6d604691177a1cf3599f6bd71f62816f0fc3f15d.zip |
s/+/-/ for bug #120403, completely my fault :(
(Portage version: 2.1_rc2-r3)
Diffstat (limited to 'net-fs')
-rw-r--r-- | net-fs/autofs/ChangeLog | 5 | ||||
-rw-r--r-- | net-fs/autofs/files/auto.net | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog index 97b7a8242840..b465758ffebc 100644 --- a/net-fs/autofs/ChangeLog +++ b/net-fs/autofs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-fs/autofs # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.55 2006/05/28 04:52:22 antarus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.56 2006/05/30 15:00:50 antarus Exp $ + + 30 May 2006; Alec Warner <antarus@gentoo.org> files/auto.net: + s/+/-/ for bug #120403, completely my fault :( *autofs-4.1.3-r6 (28 May 2006) diff --git a/net-fs/autofs/files/auto.net b/net-fs/autofs/files/auto.net index 3156f367041a..70e7f1164964 100644 --- a/net-fs/autofs/files/auto.net +++ b/net-fs/autofs/files/auto.net @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: auto.net,v 1.3 2006/05/28 04:52:22 antarus Exp $ +# $Id: auto.net,v 1.4 2006/05/30 15:00:50 antarus Exp $ # This file must be executable to work! chmod 755! @@ -22,7 +22,7 @@ opts="-fstype=nfs,hard,intr,nodev,nosuid,nonstrict" # Newer distributions get this right SHOWMOUNT="/usr/sbin/showmount --no-headers -e $key" -$SHOWMOUNT | LC_ALL=C sort +k 1 | \ +$SHOWMOUNT | LC_ALL=C sort -k 1 | \ awk -v key="$key" -v opts="$opts" -- ' BEGIN { ORS=""; first=1 } { if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 } |