tag 657990 + patch
thanks

Hi,

Please see the attached patch.

Cheers

Laurent Bigonville
--- systemd-37/debian/control	2011-10-12 08:57:21.000000000 +0200
+++ systemd-37/debian/control	2012-02-01 16:57:18.000000000 +0100
@@ -36,7 +36,7 @@
 Recommends: libpam-systemd
 Suggests: systemd-gui, python
 Depends: ${shlibs:Depends}, ${misc:Depends}, util-linux (>= 2.19.1-2), initscripts (>= 2.88dsf-13.3), udev
-Breaks: lvm2 (<< 2.02.84-1)
+Breaks: lvm2 (<< 2.02.84-1), sysvinit (<< 2.88dsf-19)
 Conflicts: klogd
 Description: system and service manager
  systemd is a replacement for sysvinit.  It is dependency-based and
--- systemd-37/debian/patches/run_initctl.patch	1970-01-01 01:00:00.000000000 +0100
+++ systemd-37/debian/patches/run_initctl.patch	2012-02-01 16:44:30.000000000 +0100
@@ -0,0 +1,148 @@
+--- a/man/systemd.1
++++ b/man/systemd.1
+@@ -348,7 +348,7 @@
+ is particularly useful to list all processes and the systemd units they belong to\&.)\&.
+ .PP
+ systemd is compatible with the SysV init system to a large degree: SysV init scripts are supported and simply read as an alternative (though limited) configuration file format\&. The SysV
+-/dev/initctl
++/run/initctl
+ interface is provided, and compatibility implementations of the various SysV client tools are available\&. In addition to that, various established Unix functionality such as
+ /etc/fstab
+ or the
+@@ -769,7 +769,7 @@
+ and the systemd process\&. This is an AF_UNIX stream socket\&. This interface is private to systemd and should not be used in external projects\&.
+ .RE
+ .PP
+-/dev/initctl
++/run/initctl
+ .RS 4
+ Limited compatibility support for the SysV client interface, as implemented by the
+ systemd\-initctl\&.service
+--- a/man/systemd.html
++++ b/man/systemd.html
+@@ -242,7 +242,7 @@
+                 to a large degree: SysV init scripts are supported and
+                 simply read as an alternative (though limited)
+                 configuration file format. The SysV
+-                <code class="filename">/dev/initctl</code> interface is
++                <code class="filename">/run/initctl</code> interface is
+                 provided, and compatibility implementations of the
+                 various SysV client tools are available. In addition to
+                 that, various established Unix functionality such as
+@@ -555,7 +555,7 @@
+                                 AF_UNIX stream socket. This interface
+                                 is private to systemd and should not
+                                 be used in external
+-                                projects.</p></dd><dt><span class="term"><code class="filename">/dev/initctl</code></span></dt><dd><p>Limited compatibility
++                                projects.</p></dd><dt><span class="term"><code class="filename">/run/initctl</code></span></dt><dd><p>Limited compatibility
+                                 support for the SysV client interface,
+                                 as implemented by the
+                                 <code class="filename">systemd-initctl.service</code>
+--- a/man/systemd.special.7.in
++++ b/man/systemd.special.7.in
+@@ -328,7 +328,7 @@
+ .PP
+ systemd\-initctl\&.service
+ .RS 4
+-This provides compatibility with the SysV /dev/initctl file system FIFO for communication with the init system\&.
++This provides compatibility with the SysV /run/initctl file system FIFO for communication with the init system\&.
+ .sp
+ This is a socket\-activated service, see
+ system\-initctl\&.socket\&.
+--- a/man/systemd.special.html.in
++++ b/man/systemd.special.html.in
+@@ -289,7 +289,7 @@
+                                         <code class="literal">$syslog</code>
+                                         facility.</p></dd><dt><span class="term"><code class="filename">systemd-initctl.service</code></span></dt><dd><p>This provides
+                                         compatibility with the SysV
+-                                        /dev/initctl file system FIFO
++                                        /run/initctl file system FIFO
+                                         for communication with the
+                                         init system.</p><p>This is a
+                                         socket-activated service, see
+--- a/man/systemd.special.xml.in
++++ b/man/systemd.special.xml.in
+@@ -572,7 +572,7 @@
+                                 <listitem>
+                                         <para>This provides
+                                         compatibility with the SysV
+-                                        /dev/initctl file system FIFO
++                                        /run/initctl file system FIFO
+                                         for communication with the
+                                         init system.</para>
+                                         <para>This is a
+--- a/man/systemd.xml
++++ b/man/systemd.xml
+@@ -442,7 +442,7 @@
+                 to a large degree: SysV init scripts are supported and
+                 simply read as an alternative (though limited)
+                 configuration file format. The SysV
+-                <filename>/dev/initctl</filename> interface is
++                <filename>/run/initctl</filename> interface is
+                 provided, and compatibility implementations of the
+                 various SysV client tools are available. In addition to
+                 that, various established Unix functionality such as
+@@ -1115,7 +1115,7 @@
+                         </varlistentry>
+ 
+                         <varlistentry>
+-                                <term><filename>/dev/initctl</filename></term>
++                                <term><filename>/run/initctl</filename></term>
+ 
+                                 <listitem><para>Limited compatibility
+                                 support for the SysV client interface,
+--- a/src/initreq.h
++++ b/src/initreq.h
+@@ -1,5 +1,5 @@
+ /*
+- * initreq.h	Interface to talk to init through /dev/initctl.
++ * initreq.h	Interface to talk to init through /run/initctl.
+  *
+  *		Copyright (C) 1995-2004 Miquel van Smoorenburg
+  *
+@@ -19,7 +19,7 @@
+ #if defined(__FreeBSD_kernel__)
+ #  define INIT_FIFO  "/etc/.initctl"
+ #else
+-#  define INIT_FIFO  "/dev/initctl"
++#  define INIT_FIFO  "/run/initctl"
+ #endif
+ 
+ #define INIT_MAGIC 0x03091969
+--- a/src/systemctl.c
++++ b/src/systemctl.c
+@@ -5088,7 +5088,7 @@
+                 goto done;
+ 
+         /* Nothing else worked, so let's try
+-         * /dev/initctl */
++         * /run/initctl */
+         if (talk_initctl() > 0)
+                 goto done;
+ 
+--- a/units/systemd-initctl.service.in
++++ b/units/systemd-initctl.service.in
+@@ -8,7 +8,7 @@
+ # See systemd.special(7) for details
+ 
+ [Unit]
+-Description=/dev/initctl Compatibility Daemon
++Description=/run/initctl Compatibility Daemon
+ DefaultDependencies=no
+ 
+ [Service]
+--- a/units/systemd-initctl.socket
++++ b/units/systemd-initctl.socket
+@@ -8,10 +8,10 @@
+ # See systemd.special(7) for details
+ 
+ [Unit]
+-Description=/dev/initctl Compatibility Named Pipe
++Description=/run/initctl Compatibility Named Pipe
+ DefaultDependencies=no
+ Before=sockets.target
+ 
+ [Socket]
+-ListenFIFO=/dev/initctl
++ListenFIFO=/run/initctl
+ SocketMode=0600
--- systemd-37/debian/patches/series	2011-10-12 09:49:13.000000000 +0200
+++ systemd-37/debian/patches/series	2012-02-01 16:44:02.000000000 +0100
@@ -1 +1,2 @@
 debian-changes
+run_initctl.patch

Reply via email to