Add an FHS exception on GNU/Hurd for /hurd and /servers

diff --git a/debian/changelog b/debian/changelog
index 803beb652f21dd5c10bfa3333ef29e6cfbea40e9..aa4fbfcc12dbea94e0e19f73741378b66333b652 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,11 @@ debian-policy (3.9.2.0) UNRELEASED; urgency=low
     Seconded: Charles Plessy <plessy@debian.org>
     Seconded: Raphaël Hertzog <hertzog@debian.org>
     Closes: #459868, #581011
+  * Policy: Add an FHS exception on GNU/Hurd for /hurd and /servers
+    Wording: Russ Allbery <rra@debian.org>
+    Seconded: Andrew McMillan <andrew@morphoss.com>
+    Seconded: Guillem Jover <guillem@debian.org>
+    Closes: #594658
   * Virtual: Added mailx as a new virtual package
     Wording: Russ Allbery <rra@debian.org>
     Seconded: Raphaël Hertzog <hertzog@debian.org>

diff --git a/policy.sgml b/policy.sgml
index edd1faf06122a997b531de8b4db7e0ac5de3a821..6455f699b8d5c9da934a1f60196683c6c05add7e 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -6039,9 +6039,21 @@ install -m644 debian/shlibs.<var>package</var> debian/<var>package</var>/DEBIAN/
                   to get access to kernel information.</footnote>
                 </p>
               </item>
+             <item>
+               <p>
+                 On GNU/Hurd systems, the following additional
+                 directories are allowed in the root
+                 filesystem: <file>/hurd</file>
+                 and <file>/servers</file>.<footnote>
+                   These directories are used to store translators and as
+                   a set of standard names for mount points,
+                   respectively.
+                 </footnote>
+               </p>
+             </item>
             </enumlist>
-
           </p>
+
           <p>
             The version of this document referred here can be
            found in the <tt>debian-policy</tt> package or on <url

diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index ebd0a68b106ca6f9e94915888ae1f8e0ec080b25..060ec0f2b1b3e4e7d9d598ab1bde8d8f2aab5043 100644 (file)
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -46,6 +46,10 @@ Unreleased.
   at least one human with their personal email address
   in <tt>Uploaders</tt> if the maintainer is a shared email address.
   </item>
+<tag>9.1.1</tag>
+  <item>GNU/Hurd systems are allowed <file>/hurd</file>
+  and <file>/servers</file> directories in the root filesystem.
+  </item>
 <tag>virtual</tag>
   <item><tt>mailx</tt> added as a virtual package provided by packages
   that install <prgn>/usr/bin/mailx</prgn> and implement at least the