[arch-commits] Commit in autofs/trunk (PKGBUILD auto.net autofs)

[Andrea Scarpino]

    Date: Monday, March 16, 2009 @ 11:38:47
  Author: andrea
Revision: 30100

upgpkg: autofs 4.1.4-5

Modified:
  autofs/trunk/PKGBUILD
  autofs/trunk/auto.net
  autofs/trunk/autofs

----------+
 PKGBUILD |    4 ++--
 auto.net |    2 +-
 autofs   |   18 ++++++++++++------
 3 files changed, 15 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-16 15:28:35 UTC (rev 30099)
+++ PKGBUILD	2009-03-16 15:38:47 UTC (rev 30100)
@@ -19,11 +19,11 @@
         auto.misc
         auto.net)
 md5sums=('7e3949114c00665b4636f0c318179657'
-         '80b77182aa957646a2074433d3890518'
+         '4eec0f479d5a85ca9ca515fd41937a4e'
          'ddd69346754419faee15fc4c7edeb8b8'
          '2fd068c5b84a3f408670fe23afd34759'
          '6d84d7ea43cdf092c64956f8cf4977f9'
-         'e4d945d63abc0488a47a5e2a750e8c3b')
+         '74d102e637e53050ef095f1cbd9d461b')
 
 build() {
   export MAKEFLAGS="-j1"

Modified: auto.net
===================================================================
--- auto.net	2009-03-16 15:28:35 UTC (rev 30099)
+++ auto.net	2009-03-16 15:38:47 UTC (rev 30100)
@@ -21,7 +21,7 @@
 # Newer distributions get this right
 SHOWMOUNT="/usr/sbin/showmount --no-headers -e $key"
 
-$SHOWMOUNT | LC_ALL=C sort +0 | \
+$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 }

Modified: autofs
===================================================================
--- autofs	2009-03-16 15:28:35 UTC (rev 30099)
+++ autofs	2009-03-16 15:38:47 UTC (rev 30100)
@@ -277,23 +277,29 @@
   FS="="
   daemon_opts[ "timeout" ] = "timeout"
   daemon_opts[ "t" ] = "timeout"
+  daemon_opts[ "ghost" ] = "ghost"
+  daemon_opts[ "g" ] = "ghost"
 }
 {
   if ( $0 ~ /^$/ )
     next
   if ( $1 in daemon_opts ) {
     daemon[ daemon_opts[ $1 ] ] = $2
-    } else if ($1 ~ /^D.+/) {
-      defines[ $1 ] = $2
-    } else {
-  mount[NR] = $0
+  } else if ($1 ~ /^D.+/) {
+    defines[ $1 ] = $2
+  } else {
+    mount[NR] = $0
   }
 }
 END {
   if ( which ~ "^daemon$" ) {
-    if ( "timeout" in daemon ) {
-      printf "--timeout=%s\n", daemon["timeout"]
+    for ( parameter in daemon ) {
+      if ( daemon[ parameter ] ~ /^$/ )
+        printf "--%s ", parameter
+      else
+        printf "--%s=%s ", parameter, daemon[ parameter ]
     }
+    printf "\n"
   } else {
     for ( a in defines ) {
       printf "-%s=%s ", a, defines[a]