From 02f6b141264f8a022958a7c9c998e15d5355d3a5 Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@centraldogma>
Date: Fri, 2 Dec 2011 01:38:21 +0100
Subject: [PATCH] prevent factotum <-> authsrv deadlock

---
 lib/namespace | 2 +-
 rc/bin/cpurc  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/namespace b/lib/namespace
index 712da06c5..53735f04d 100644
--- a/lib/namespace
+++ b/lib/namespace
@@ -12,7 +12,7 @@ bind -q #σ /shr
 bind -a #¤ /dev
 
 # authentication
-mount -a /srv/factotum /mnt
+mount -b /srv/factotum /mnt
 
 # mount points
 mount -a /srv/slashn /n
diff --git a/rc/bin/cpurc b/rc/bin/cpurc
index 595ef0016..41efb0c6c 100755
--- a/rc/bin/cpurc
+++ b/rc/bin/cpurc
@@ -66,8 +66,13 @@ case `{	echo $sysname; ndb/query sys $sysname dom
 	for(i in `{awk '/u\ *$/{print $1}' /net/ipselftab}){
 		echo $i; ndb/ipquery ip $i dom; ndb/ipquery ip $i sys
 	} | sed 's,[^ ]+=,,g'}}
+
 	# cpu+auth server
+
+	# prevent factotum deadlock
 	aux/stub -d /mnt/keys
+	aux/stub -d /mnt/netkeys
+
 	auth/keyfs -wp -m /mnt/keys /adm/keys
 	aux/listen -q -t /rc/bin/service.auth -d /rc/bin/service tcp
 case *