--- netmount	2010-10-20 10:40:07.000000000 -0700
+++ netmount.new	2010-10-20 10:41:14.000000000 -0700
@@ -11,9 +11,9 @@
 	local myneed="" myuse=""
 	local nfs_mounts=$(awk '!/^[[:space:]]*#/ && ($3=="nfs" || $3=="nfs4") && $4 !~ /\<(noauto|nolock)\>/ { print $0 }' /etc/fstab)
 	if [[ -n ${nfs_mounts} ]] ; then
-		myneed="${myneed} portmap rpc.statd"
+		myneed="${myneed} portmap rpc.statd rpc.idmapd rpc.gssd"
 	else
-		myuse="${myuse} portmap rpc.statd"
+		myuse="${myuse} portmap rpc.statd rpc.idmapd rpc.gssd"
 	fi
 	need net ${myneed}
 	use afs-client openafs-client amd autofs nfs nfsmount ${myuse}
@@ -61,7 +61,7 @@
 	rcfilesystems=${rcfilesystems// /,}   # convert to comma-separated
 
 	ebegin "Unmounting network filesystems"
-	[[ -z $(umount -art ${rcfilesystems} 2>&1) ]]
+	[[ -z $(umount -art ${rcfilesystems} 2>&1) && $? == 0 ]]
 	eend $? "Failed to simply unmount filesystems"
 	[[ $? == 0 ]] && return 0