From: Michael Meffie <mmeffie@sinenomine.net>
Date: Fri, 16 Sep 2011 15:23:18 +0000 (-0400)
Subject: solaris: libafs depends on fs/ufs
X-Git-Tag: upstream/1.6.1.pre1^2~9
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=1aaf64bac4e37811b40f7f75d524e4e7de8f82e5;p=packages%2Fo%2Fopenafs.git

solaris: libafs depends on fs/ufs

The solaris afs module depends on symbols exported by fs/ufs.
Set this dependency in the afs module so the kernel loader
will automatically load the fs/ufs driver if is not already
loaded, such on zfs only systems.

Reviewed-on: http://gerrit.openafs.org/5456
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit 0cb10104f5af73614e6b7673d3711ddbc3f3a866)

Change-Id: Ifcb5e2725bbd2de44218109aac9c20439dadf41e
Reviewed-on: http://gerrit.openafs.org/6315
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/afs/SOLARIS/osi_vfsops.c b/src/afs/SOLARIS/osi_vfsops.c
index 9207914cd..a7e7d1dd0 100644
--- a/src/afs/SOLARIS/osi_vfsops.c
+++ b/src/afs/SOLARIS/osi_vfsops.c
@@ -511,7 +511,12 @@ static struct sysent afssysent = {
 #endif /* AFS_SUN511_ENV */
 
 /* inter-module dependencies */
-char _depends_on[] = "drv/ip drv/udp strmod/rpcmod";
+char _depends_on[] = 
+#if AFS_SUN510_ENV
+	"drv/ip drv/udp strmod/rpcmod fs/ufs";
+#else
+	"drv/ip drv/udp strmod/rpcmod";
+#endif
 
 /*
  * Info/Structs to link the afs module into the kernel