2 files changed, 21 insertions, 4 deletions
diff --git a/initramfs/distro-specs/suse/functions-10.3 b/initramfs/distro-specs/suse/functions-10.3
index e6ae8faa..68373262 100644
--- a/initramfs/distro-specs/suse/functions-10.3
+++ b/initramfs/distro-specs/suse/functions-10.3
@@ -26,6 +26,7 @@ config_kdm_template
 config_nfsv4 () {
 if [ "x$start_nfsv4" = "xyes" ]; then
   testmkd /mnt/var/lib/nfs/rpc_pipefs
+  testmkd /mnt/var/lib/nfs/sm
   sed -e "s,NFS_SECURITY_GSS=.*,NFS_SECURITY_GSS=\"yes\"," \
       -e "s,NFS4_SUPPORT=.*,NFS4_SUPPORT=\"yes\"," \
       -i /mnt/etc/sysconfig/nfs
@@ -36,8 +37,7 @@ echo -e "\t# stuff needed for nfsv4\n\tmount -t rpc_pipefs rpc_pipefs \
 >>/mnt/etc/${D_INITDIR}/boot.slx
   # portmap is required for any NFS
   config_portmap
-  rllinker "idmapd" 14 8
-  rllinker "gssd" 15 7
+  rllinker "nfs" 14 8
 fi
 }
 
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index b1f9c34a..ed973fa9 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -396,10 +396,27 @@ if [ -f /mnt/etc/init.d/autofs ] ; then
       -e "s,AUTOFS_OPTIONS.*,AUTOFS_OPTIONS=\"--timeout 3\"," \
       -i /mnt/etc/${D_SYSCONFDIR}/autofs
   config_portmap
-  rllinker "autofs" 18 4
+  rllinker "autofs" 12 4
+fi
+}
+# config nfsv4
+config_nfsv4 () {
+if [ "x$start_nfsv4" = "xyes" ]; then
+  testmkd /mnt/var/lib/nfs/rpc_pipefs
+  testmkd /mnt/var/lib/nfs/sm
+  sed -e "s,NEED_IDMAPD=.*,NEED_IDMAPD=\"yes\"," \
+      -e "s,NEED_GSSD=.*,NEED_GSSD=\"yes\"," \
+      -i /mnt/etc/${D_SYSCONFDIR}/nfs-common
+  echo -e "rpc_pipefs\t/var/lib/nfs/rpc_pipefs rpc_pipefs defaults\t 0 0\n\
+nfsd\t\t/proc/fs/nfsd\tnfsd\t\tdefaults\t 0 0" >>/tmp/fstab
+echo -e "\t# stuff needed for nfsv4\n\tmount -t rpc_pipefs rpc_pipefs \
+/var/lib/nfs/rpc_pipefs\n\tmount -t nfsd nfsd /proc/fs/nfsd" \
+>>/mnt/etc/${D_INITDIR}/boot.slx
+  # portmap is required for any NFS
+  config_portmap
+  rllinker "nfs-common" 10 8
 fi
 }
-
 # start portmapper (needed at least for nfs and nis services)
 config_portmap () {
   rllinker "portmap" 2 20