[systemd-commits] 2 commits - man/systemd.special.xml.in tmpfiles.d/x11.conf

[Lennart Poettering]

 man/systemd.special.xml.in |   28 ++++++++++++++--------------
 tmpfiles.d/x11.conf        |    2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit db47cc2ae0b8ad2eaa3990d19783308f5117a317
Author: Josh Triplett <josh at joshtriplett.org>
Date:   Sat Aug 6 16:04:38 2011 -0700

    man: Sort the entries in systemd.special(7)
    
    This manpage presents the special targets in alphabetical order, but
    time-sync.target appeared in the wrong place.

diff --git a/man/systemd.special.xml.in b/man/systemd.special.xml.in
index ecc9dde..1369b4b 100644
--- a/man/systemd.special.xml.in
+++ b/man/systemd.special.xml.in
@@ -68,7 +68,6 @@
                 <filename>remote-fs.target</filename>,
                 <filename>rescue.target</filename>,
                 <filename>rpcbind.target</filename>,
-                <filename>time-sync.target</filename>,
                 <filename>runlevel2.target</filename>,
                 <filename>runlevel3.target</filename>,
                 <filename>runlevel4.target</filename>,
@@ -83,6 +82,7 @@
                 <filename>systemd-initctl.socket</filename>,
                 <filename>systemd-logger.service</filename>,
                 <filename>systemd-logger.socket</filename>,
+                <filename>time-sync.target</filename>,
                 <filename>umount.target</filename></para>
         </refsynopsisdiv>
 
@@ -399,19 +399,6 @@
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
-                                <term><filename>time-sync.target</filename></term>
-                                <listitem>
-                                        <para>systemd automatically
-                                        adds dependencies of type
-                                        After for this target unit to
-                                        all SysV init script service
-                                        units with an LSB header
-                                        referring to the
-                                        <literal>$time</literal>
-                                        facility.</para>
-                                </listitem>
-                        </varlistentry>
-                        <varlistentry>
                                 <term><filename>runlevel2.target</filename></term>
                                 <listitem>
                                         <para>This is a target that is
@@ -623,6 +610,19 @@
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
+                                <term><filename>time-sync.target</filename></term>
+                                <listitem>
+                                        <para>systemd automatically
+                                        adds dependencies of type
+                                        After for this target unit to
+                                        all SysV init script service
+                                        units with an LSB header
+                                        referring to the
+                                        <literal>$time</literal>
+                                        facility.</para>
+                                </listitem>
+                        </varlistentry>
+                        <varlistentry>
                                 <term><filename>umount.target</filename></term>
                                 <listitem>
                                         <para>A special target unit

commit 3b09f343fe2414cfb36860f1692f327011c4bc44
Author: Josh Triplett <josh at joshtriplett.org>
Date:   Sat Aug 6 15:56:39 2011 -0700

    tmpfiles: Remove X11 lock files for displays :10 and higher too

diff --git a/tmpfiles.d/x11.conf b/tmpfiles.d/x11.conf
index 5072b58..7f81af6 100644
--- a/tmpfiles.d/x11.conf
+++ b/tmpfiles.d/x11.conf
@@ -15,4 +15,4 @@ d /tmp/.font-unix 1777 root root 10d
 d /tmp/.Test-unix 1777 root root 10d
 
 # Unlink the X11 lock files
-r /tmp/.X[0-9]-lock
+r /tmp/.X[0-9]*-lock