Merge pull request #1438 from poettering/rfkill-rework

An rfkill rework among other things

3 files changed, 40 insertions, 27 deletions

diff --git a/man/systemd-rfkill@.service.xml b/man/systemd-rfkill.service.xml
index 709b09d818..f464842700 100644
--- a/man/systemd-rfkill@.service.xml
+++ b/man/systemd-rfkill.service.xml
@@ -19,10 +19,10 @@
   You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
-<refentry id="systemd-rfkill@.service" conditional='ENABLE_RFKILL'>
+<refentry id="systemd-rfkill.service" conditional='ENABLE_RFKILL'>
 
   <refentryinfo>
-    <title>systemd-rfkill@.service</title>
+    <title>systemd-rfkill.service</title>
     <productname>systemd</productname>
 
     <authorgroup>
@@ -36,27 +36,29 @@
   </refentryinfo>
 
   <refmeta>
-    <refentrytitle>systemd-rfkill@.service</refentrytitle>
+    <refentrytitle>systemd-rfkill.service</refentrytitle>
     <manvolnum>8</manvolnum>
   </refmeta>
 
   <refnamediv>
-    <refname>systemd-rfkill@.service</refname>
+    <refname>systemd-rfkill.service</refname>
+    <refname>systemd-rfkill.socket</refname>
     <refname>systemd-rfkill</refname>
-    <refpurpose>Load and save the RF kill switch state at boot and shutdown</refpurpose>
+    <refpurpose>Load and save the RF kill switch state at boot and change</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>systemd-rfkill@.service</filename></para>
+    <para><filename>systemd-rfkill.service</filename></para>
+    <para><filename>systemd-rfkill.socket</filename></para>
     <para><filename>/usr/lib/systemd/systemd-rfkill</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
     <title>Description</title>
 
-    <para><filename>systemd-rfkill@.service</filename> is a service
+    <para><filename>systemd-rfkill.service</filename> is a service
     that restores the RF kill switch state at early boot and saves it
-    at shutdown. On disk, the RF kill switch state is stored in
+    on each change. On disk, the RF kill switch state is stored in
     <filename>/var/lib/systemd/rfkill/</filename>.</para>
   </refsect1>
 
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index eeb98198ab..897ea464d9 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -905,21 +905,23 @@
 
       <varlistentry>
         <term><varname>USBFunctionDescriptors=</varname></term>
-        <listitem><para>Configure the location of the file containing
-        <ulink url="https://www.kernel.org/doc/Documentation/usb/functionfs.txt">functionfs</ulink>
-        descriptors. This is is used only when a socket with
-        <varname>ListenUSBFunction=</varname> configured wants to
-        activate this service. Content of this file is writen to
-        <filename>ep0</filename> file after it is opened. This is
-        required for socket activation using
-        <varname>ListenUSBFunction=</varname> (i.e. for passing all
-        functionfs endpoints to the service).</para></listitem>
+        <listitem><para>Configure the location of a file containing
+        <ulink
+        url="https://www.kernel.org/doc/Documentation/usb/functionfs.txt">USB
+        FunctionFS</ulink> descriptors, for implementation of USB
+        gadget functions. This is is used only in conjunction with a
+        socket unit with <varname>ListenUSBFunction=</varname>
+        configured. The contents of this file is written to the
+        <filename>ep0</filename> file after it is
+        opened.</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term><varname>USBFunctionStrings=</varname></term>
-        <listitem><para>Configure the location of file containing FunctionFS strings.
-        Behavior is similar to <varname>USBFunctionDescriptors</varname>.</para></listitem>
+        <listitem><para>Configure the location of a file containing
+        USB FunctionFS strings.  Behavior is similar to
+        <varname>USBFunctionDescriptors=</varname>
+        above.</para></listitem>
       </varlistentry>
 
     </variablelist>
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index bb75b69cea..212764075d 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -262,14 +262,15 @@
 
       <varlistentry>
         <term><varname>ListenUSBFunction=</varname></term>
-        <listitem><para>Specifies a
-        <ulink url="https://www.kernel.org/doc/Documentation/usb/functionfs.txt">functionfs</ulink>
-        endpoint location to
-        listen on. This expects an absolute file system path as the
-        argument. Behavior otherwise is very similar to the
-        <varname>ListenFIFO=</varname> directive above. Use this to
-        open functionfs endpoint <filename>ep0</filename>. When using
-        this option, activated service has to have the
+        <listitem><para>Specifies a <ulink
+        url="https://www.kernel.org/doc/Documentation/usb/functionfs.txt">USB
+        FunctionFS</ulink> endpoint location to listen on, for
+        implementation of USB gadget functions. This expects an
+        absolute file system path as the argument. Behavior otherwise
+        is very similar to the <varname>ListenFIFO=</varname>
+        directive above. Use this to open FunctionFS endpoint
+        <filename>ep0</filename>. When using this option, the
+        activated service has to have the
         <varname>USBFunctionDescriptors=</varname> and
         <varname>USBFunctionStrings=</varname> options set.
         </para></listitem>
@@ -381,6 +382,14 @@
       </varlistentry>
 
       <varlistentry>
+        <term><varname>Writable=</varname></term>
+        <listitem><para>Takes a boolean argument. May only be used in
+        conjunction with <varname>ListenSpecial=</varname>. If true,
+        the specified special file is opened in read-write mode, if
+        false in read-only mode. Defaults to false.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><varname>MaxConnections=</varname></term>
         <listitem><para>The maximum number of connections to
         simultaneously run services instances for, when