rpms/autofs/devel autofs-4.1.4-init-one-auto-master.patch, 1.1, 1.2 autofs.spec, 1.58, 1.59

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18376

Modified Files:
	autofs-4.1.4-init-one-auto-master.patch autofs.spec 
Log Message:
- Fix up the one-auto-master patch.  My "improvements" had side-effects.



autofs-4.1.4-init-one-auto-master.patch:
 rc.autofs.in |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+)

Index: autofs-4.1.4-init-one-auto-master.patch
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs-4.1.4-init-one-auto-master.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autofs-4.1.4-init-one-auto-master.patch	13 Apr 2005 23:34:44 -0000	1.1
+++ autofs-4.1.4-init-one-auto-master.patch	14 Apr 2005 00:23:30 -0000	1.2
@@ -1,5 +1,5 @@
---- autofs-4.1.4/samples/rc.autofs.in.orig	2005-04-13 18:26:26.030971240 -0400
-+++ autofs-4.1.4/samples/rc.autofs.in	2005-04-13 18:28:38.999756912 -0400
+--- autofs-4.1.4/samples/rc.autofs.in.orig	2005-04-13 20:15:19.912670240 -0400
++++ autofs-4.1.4/samples/rc.autofs.in	2005-04-13 20:20:04.839354800 -0400
 @@ -75,6 +75,7 @@
  	UNDERSCORETODOT=1
  	DISABLE_DIRECT=1
@@ -8,75 +8,42 @@
  
  	[ -f /etc/sysconfig/autofs ] && . /etc/sysconfig/autofs
  
-@@ -161,34 +162,56 @@
- 
- function getrawmounts()
- {
-+    oldIFS="$IFS"
-+    IFS=""
-     for scheme in `getschemes` ; do
+@@ -165,6 +166,12 @@
          case "$scheme" in
              files)
                  if [ -z "$filescheme" ] ; then
--                    getfilemounts
 +                    FILEMOUNTS=`getfilemounts`
-+                    echo $FILEMOUNTS
-                     filescheme=1
-                     export filescheme
 +                    if [ -n "$FILEMOUNTS" ] && [ "$ONE_AUTO_MASTER" -eq 1 ];
 +                    then
-+                        IFS="$oldIFS"
-+                        return;
++                        getfilemounts
++                        return
 +                    fi
-                 fi
+                     getfilemounts
+                     filescheme=1
+                     export filescheme
+@@ -172,6 +179,12 @@
                  ;;
              nis)
                  if [ -z "$nisscheme" ] ; then
--                    getnismounts
 +                    NISMOUNTS=`getnismounts`
-+                    echo $NISMOUNTS
-                     nisscheme=1
-                     export nisscheme
 +                    if [ -n "$NISMOUNTS" ] && [ "$ONE_AUTO_MASTER" -eq 1 ];
 +                    then
-+                        IFS="$oldIFS"
-+                        return;
++                        getnismounts
++                        return
 +                    fi
-                 fi
+                     getnismounts
+                     nisscheme=1
+                     export nisscheme
+@@ -179,6 +192,12 @@
                  ;;
              ldap*)
                  if [ -z "$ldapscheme" ] ; then
--                    getldapmounts
 +                    LDAPMOUNTS=`getldapmounts`
-+                    echo $LDAPMOUNTS
-                     ldapscheme=1
-                     export ldapscheme
-+                    if [ -n "LDAPMOUNTS" ] && [ "$ONE_AUTO_MASTER" -eq 1 ];
++                    if [ -n "$LDAPMOUNTS" ] && [ "$ONE_AUTO_MASTER" -eq 1 ];
 +                    then
-+                        IFS="$oldIFS"
-+                        return;
++                        getldapmounts
++                        return
 +                    fi
-                 fi
-                 ;;
-             \#*)
-+                IFS=$oldIFS
-                 return
-                 ;;
-         esac
-     done
-+    IFS=$oldIFS
- }
- 
- 
---- autofs-4.1.4/redhat/autofs.sysconfig.orig	2005-04-13 19:03:16.896868536 -0400
-+++ autofs-4.1.4/redhat/autofs.sysconfig	2005-04-13 19:03:20.183368912 -0400
-@@ -12,6 +12,9 @@
- #  UNDERSCORETODOT changes auto_home to auto.home and auto_mnt to auto.mnt
- UNDERSCORETODOT=1
- DISABLE_DIRECT=1
-+# Only source one master map if set to 1.  This would mimic Sun behaviour.
-+# The default is 0 to maintain backwards compatibility.
-+ONE_AUTO_MASTER=0
- 
- # Using a good number of maps can cause autofs to take
- # some time to exit. If you get init script stop fails
+                     getldapmounts
+                     ldapscheme=1
+                     export ldapscheme


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- autofs.spec	13 Apr 2005 23:34:44 -0000	1.58
+++ autofs.spec	14 Apr 2005 00:23:30 -0000	1.59
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.4
-%define release 2
+%define release 3
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -117,6 +117,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Wed Apr 13 2005 Jeff Moyer <jmoyer at redhat.com> - 1:4.1.4-3
+- Fix up the one-auto-master patch.  My "improvements" had side-effects.
+
 * Wed Apr 13 2005 Jeff Moyer <jmoyer at redhat.com> - 1:4.1.4-2
 - Import 4.1.4 and merge.