From 1fac75d61909388877c054d71549c861c89aaf0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Mon, 22 Apr 2013 00:56:56 +0200
Subject: [PATCH] =?UTF-8?q?[nfs-server/client]=20idmapd=20n'est=20ni=20n?=
 =?UTF-8?q?=C3=A9cessaire=20ni=20d=C3=A9sir=C3=A9,=20on=20le=20jette.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bundler/nfs-client.xml                              | 6 +++---
 Bundler/nfs-server.xml                              | 2 +-
 Cfg/etc/default/nfs-kernel-server/nfs-kernel-server | 2 +-
 Rules/nfs-client.xml                                | 4 ++++
 4 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 Rules/nfs-client.xml

diff --git a/Bundler/nfs-client.xml b/Bundler/nfs-client.xml
index 9ca02f1..3140696 100644
--- a/Bundler/nfs-client.xml
+++ b/Bundler/nfs-client.xml
@@ -1,4 +1,4 @@
-<Bundle name="nfs-client">
-    <Path "/etc/idmapd.conf"/>
-    <Service "nfs-common"/>
+<Bundle name="nfs-client" version="2.0">
+  <Path name="/etc/default/nfs-common"/>
+  <Package name="nfs-common"/>
 </Bundle>
diff --git a/Bundler/nfs-server.xml b/Bundler/nfs-server.xml
index dc47be0..b67f8d3 100644
--- a/Bundler/nfs-server.xml
+++ b/Bundler/nfs-server.xml
@@ -1,5 +1,5 @@
 <Bundle name="nfs-server">
-  <Group name="crans-nfs-squeeze">
+  <Group name="crans-nfs">
     <Service name="nfs-kernel-server"/>
     <Path name="/etc/default/nfs-kernel-server"/>
     <Path name="/etc/exports"/>
diff --git a/Cfg/etc/default/nfs-kernel-server/nfs-kernel-server b/Cfg/etc/default/nfs-kernel-server/nfs-kernel-server
index a4e967c..6cb94d8 100644
--- a/Cfg/etc/default/nfs-kernel-server/nfs-kernel-server
+++ b/Cfg/etc/default/nfs-kernel-server/nfs-kernel-server
@@ -4,7 +4,7 @@
 ##################################
 
 # Number of servers to start up
-RPCNFSDCOUNT=8
+RPCNFSDCOUNT="8 --no-nfs-version 4"
 
 # Runtime priority of server (see nice(1))
 RPCNFSDPRIORITY=0
diff --git a/Rules/nfs-client.xml b/Rules/nfs-client.xml
new file mode 100644
index 0000000..0b43606
--- /dev/null
+++ b/Rules/nfs-client.xml
@@ -0,0 +1,4 @@
+<!-- Règles concernant les serveurs équipés de nfs-common (tous)//-->
+<Rules priority="1">
+  <Service type="deb" name="nfs-common" status="on"/>
+</Rules>