From: Russ Allbery <rra@debian.org>
Date: Fri, 13 Jan 2012 17:21:28 +0000 (-0800)
Subject: Merge branch 'master' into bug498300-rra
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bec143010dd02798dbb7b6fa26d754a476cf0166;hp=-c;p=debian%2Fdebian-policy.git

Merge branch 'master' into bug498300-rra
---

bec143010dd02798dbb7b6fa26d754a476cf0166
diff --combined policy.sgml
index 0f1dbf9,6ae5474..23c1913
--- a/policy.sgml
+++ b/policy.sgml
@@@ -4628,7 -4628,7 +4628,7 @@@ Depends: libc6 (>= 2.2.1), exim | mail-
  	  Relationships may be restricted to a certain set of
  	  architectures.  This is indicated in brackets after each
  	  individual package name and the optional version specification.
 -	  The brackets enclose a list of Debian architecture names
 +	  The brackets enclose a non-empty list of Debian architecture names
  	  in the format described in <ref id="arch-spec">,
  	  separated by whitespace.  Exclamation marks may be prepended to
  	  each of the names.  (It is not permitted for some names to be
@@@ -6246,6 -6246,25 +6246,25 @@@ install -m644 debian/shlibs.<var>packag
                    symlinked there, is relaxed to a recommendation.
                  </p>
                </item>
+ 	      <item>
+ 		<p>
+ 		  The additional directory <file>/run</file> in the root
+ 		  file system is allowed.  <file>/run</file>
+ 		  replaces <file>/var/run</file>, and the
+ 		  subdirectory <file>/run/lock</file>
+ 		  replaces <file>/var/lock</file>, with
+ 		  the <file>/var</file> directories replaced by symlinks
+ 		  for backwards compatibility.  <file>/run</file>
+ 		  and <file>/run/lock</file> must follow all of the
+ 		  requirements in the FHS for <file>/var/run</file>
+ 		  and <file>/var/lock</file>, respectively, such as file
+ 		  naming conventions, file format requirements, or the
+ 		  requirement that files be cleared during the boot
+ 		  process.  Files and directories residing
+ 		  in <file>/run</file> should be stored on a temporary
+ 		  file system.
+ 		</p>
+ 	      </item>
                <item>
                  <p>
                    The following directories in the root filesystem are
@@@ -6388,6 -6407,29 +6407,29 @@@ rmdir /usr/local/share/emacs 2>/dev/nul
  	    though the spool may still be physically located there.
  	  </p>
  	</sect1>
+ 
+ 	<sect1 id="fhs-run">
+ 	  <heading><file>/run</file> and <file>/run/lock</file></heading>
+ 
+ 	  <p>
+ 	    The directory <file>/run</file> is cleared at boot, normally
+ 	    by being a mount point for a temporary file system.  Packages
+ 	    therefore must not assume that any files or directories
+ 	    under <file>/run</file> other than <file>/run/lock</file>
+ 	    exist unless the package has arranged to create those files or
+ 	    directories since the last reboot.  Normally, this is done by
+ 	    the package via an init script.  See <ref id="writing-init">
+ 	    for more information.
+ 	  </p>
+ 
+ 	  <p>
+ 	    Packages must not include files or directories
+ 	    under <file>/run</file>, or under the
+ 	    older <file>/var/run</file> and <file>/var/lock<file> paths.
+ 	    The latter paths will normally be symlinks or other
+ 	    redirections to <file>/run</file> for backwards compatibility.
+ 	  </p>
+ 	</sect1>
        </sect>
  
        <sect>
@@@ -6762,15 -6804,14 +6804,14 @@@ test -f <var>program-executed-later-in-
  	  </p>
  
  	  <p>
- 	    <file>/var/run</file> and <file>/var/lock</file> may be mounted
- 	    as temporary filesystems<footnote>
- 		For example, using the <tt>RAMRUN</tt> and <tt>RAMLOCK</tt>
- 		options in <file>/etc/default/rcS</file>.
- 	    </footnote>, so the <file>init.d</file> scripts must handle this
- 	    correctly. This will typically amount to creating any required
- 	    subdirectories dynamically when the <file>init.d</file> script
- 	    is run, rather than including them in the package and relying on
- 	    <prgn>dpkg</prgn> to create them.
+             Files and directories under <file>/run</file>, including ones
+             referred to via the compatibility paths <file>/var/run</file>
+             and <file>/var/lock</file>, are normally stored on a temporary
+             filesystem and are normally not persistent across a reboot.
+             The <file>init.d</file> scripts must handle this correctly.
+             This will typically mean creating any required subdirectories
+             dynamically when the <file>init.d</file> script is run.
+             See <ref id="fhs-run"> for more information.
  	  </p>
  	</sect1>
  
@@@ -11328,7 -11369,7 +11369,7 @@@ END-INFO-DIR-ENTR
       dpkg-divert --package smailwrapper --remove --rename \
          --divert /usr/sbin/smail.real /usr/sbin/smail
    fi
- 	</example> where <tt>1.02-2</tt> is the version at which the
+ 	</example> where <tt>1.0-2</tt> is the version at which the
  	diversion was first added to the package.  The postrm should not
  	remove the diversion on upgrades both because there's no reason to
  	remove the diversion only to immediately re-add it and since the