[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 25823ba4e436feca30fc73fa2773f46bcad2ef1e

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 25823ba4e436feca30fc73fa2773f46bcad2ef1e
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Tue Apr 3 21:17:54 2012 +0200

    Allow non-kerberized NFS4 mounts as long as #638157 is an issue.
    
    Look at http://bugs.debian.org/638157 on how to make kerberized
    NFS4 work.

diff --git a/fai/config/files/etc/ldap/autofs.ldif/SERVER_A b/fai/config/files/etc/ldap/autofs.ldif/SERVER_A
index bcbc686..f14ac4e 100644
--- a/fai/config/files/etc/ldap/autofs.ldif/SERVER_A
+++ b/fai/config/files/etc/ldap/autofs.ldif/SERVER_A
@@ -39,4 +39,4 @@ ou: auto.mainserver
 dn: cn=/,ou=auto.mainserver,ou=automount,dc=intern
 objectClass: automount
 cn: /
-automountInformation: -fstype=nfs4,sec=krb5i,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid mainserver.intern:/&
+automountInformation: -fstype=nfs4,sec=sys,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid mainserver.intern:/&
diff --git a/fai/config/scripts/NFS_SERVER/10-config b/fai/config/scripts/NFS_SERVER/10-config
index 2b265fa..44c1bad 100755
--- a/fai/config/scripts/NFS_SERVER/10-config
+++ b/fai/config/scripts/NFS_SERVER/10-config
@@ -26,8 +26,8 @@ editfiles:
 
 	{ ${target}/etc/exports
 	  ## kerberized NFS4:
-	  AppendIfNoSuchLine "/srv/nfs4        10.0.0.0/8(sec=krb5p:krb5i,rw,sync,fsid=0,crossmnt,no_subtree_check)"
-	  AppendIfNoSuchLine "/srv/nfs4/home0  10.0.0.0/8(sec=krb5p:krb5i,rw,sync,no_subtree_check)"
+	  AppendIfNoSuchLine "/srv/nfs4        10.0.0.0/8(sec=krb5p:krb5i:sys,rw,sync,fsid=0,crossmnt,no_subtree_check)"
+	  AppendIfNoSuchLine "/srv/nfs4/home0  10.0.0.0/8(sec=krb5p:krb5i:sys,rw,sync,no_subtree_check)"
 	}
 
 	{ ${target}/etc/fstab

-- 
Debian-LAN development and packaging