← Back to branch summary

~ubuntu-branches/debian/jessie/systemd/jessie

« back to all changes in this revision

Viewing changes to man/systemd.xml

  • Committer: Package Import Robot
  • Author(s): Tollef Fog Heen, Tollef Fog Heen, Michael Biebl
  • Date: 2012-04-03 19:59:17 UTC
  • mfrom: (1.1.10) (6.1.3 experimental)
  • Revision ID: package-import@ubuntu.com-20120403195917-l532urrbg4pkreas
Tags: 44-1
http://bugs.debian.org/664364
http://bugs.debian.org/663219
http://bugs.debian.org/663323
[ Tollef Fog Heen ]
* New upstream version.
  - Backport 3492207: journal: PAGE_SIZE is not known on ppc and other
    archs
  - Backport 5a2a2a1: journal: react with immediate rotation to a couple
    of more errors
  - Backport 693ce21: util: never follow symlinks in rm_rf_children()
    Fixes CVE-2012-1174, closes: #664364
* Drop output message from init-functions hook, it's pointless.
* Only rmdir /lib/init/rw if it exists.
* Explicitly order debian-fixup before sysinit.target to prevent a
  possible race condition with the creation of sockets.  Thanks to
  Michael Biebl for debugging this.
* Always restart the initctl socket on upgrades, to mask sysvinit
  removing it.

[ Michael Biebl ]
* Remove workaround for non-interactive sessions from pam config again.
* Create compat /dev/initctl symlink in case we are upgrading from a system
  running a newer version of sysvinit (using /run/initctl) and sysvinit is
  replaced with systemd-sysv during the upgrade. Closes: #663219
* Install new man pages.
* Build-Depend on valac (>= 0.12) instead of valac-0.12. Closes: #663323

Show diffs side-by-side

added added

removed removed

Lines of Context:
man/systemd.xml
209
209
                                <listitem><para>Set log
210
210
                                target. Argument must be one of
211
211
                                <option>console</option>,
 
212
                                <option>journal</option>,
212
213
                                <option>syslog</option>,
213
214
                                <option>kmsg</option>,
 
215
                                <option>journal-or-kmsg</option>,
214
216
                                <option>syslog-or-kmsg</option>,
215
217
                                <option>null</option>.</para></listitem>
216
218
                        </varlistentry>
266
268
                                <option>inherit</option>,
267
269
                                <option>null</option>,
268
270
                                <option>tty</option>,
 
271
                                <option>journal</option>,
 
272
                                <option>journal+console</option>,
269
273
                                <option>syslog</option>,
270
274
                                <option>syslog+console</option>,
271
275
                                <option>kmsg</option>,
272
276
                                <option>kmsg+console</option>.  If the
273
277
                                argument is omitted
274
278
                                <option>--default-standard-output=</option>
275
 
                                defaults to <option>syslog</option>
 
279
                                defaults to <option>journal</option>
276
280
                                and
277
281
                                <option>--default-standard-error=</option>
278
282
                                to
813
817
                                <listitem><para>Sets the log level to
814
818
                                <literal>debug</literal>
815
819
                                (resp. <literal>info</literal> on
816
 
                                <literal>SIGRTMIN+32</literal>), as
 
820
                                <literal>SIGRTMIN+23</literal>), as
817
821
                                controlled via
818
822
                                <varname>systemd.log_level=debug</varname>
819
823
                                (resp. <varname>systemd.log_level=info</varname>
823
827
                        </varlistentry>
824
828
 
825
829
                        <varlistentry>
 
830
                                <term>SIGRTMIN+26</term>
826
831
                                <term>SIGRTMIN+27</term>
827
832
                                <term>SIGRTMIN+28</term>
828
833
                                <term>SIGRTMIN+29</term>
829
834
 
830
835
                                <listitem><para>Sets the log level to
831
 
                                <literal>console</literal>
832
 
                                (resp. <literal>kmsg</literal> on
 
836
                                <literal>journal-or-kmsg</literal>
 
837
                                (resp. <literal>console</literal> on
 
838
                                <literal>SIGRTMIN+27</literal>;
 
839
                                resp. <literal>kmsg</literal> on
833
840
                                <literal>SIGRTMIN+28</literal>;
834
841
                                resp. <literal>syslog-or-kmsg</literal>
835
842
                                on <literal>SIGRTMIN+29</literal>), as
836
843
                                controlled via
837
 
                                <varname>systemd.log_target=console</varname>
838
 
                                (resp. <varname>systemd.log_target=kmsg</varname>
 
844
                                <varname>systemd.log_target=journal-or-kmsg</varname>
 
845
                                (resp. <varname>systemd.log_target=console</varname>
 
846
                                on <literal>SIGRTMIN+27</literal>;
 
847
                                resp. <varname>systemd.log_target=kmsg</varname>
839
848
                                on <literal>SIGRTMIN+28</literal>;
840
849
                                resp
841
850
                                <varname>systemd.log_target=syslog-or-kmsg</varname>
948
957
        <refsect1>
949
958
                <title>Kernel Command Line</title>
950
959
 
951
 
                <para>When run as system instance systemd parses a few kernel command line arguments:</para>
 
960
                <para>When run as system instance systemd parses a
 
961
                number of kernel command line
 
962
                arguments<footnote><para>If run inside a Linux
 
963
                container these arguments may be passed as command
 
964
                line arguments to systemd itself, next to any of the
 
965
                command line options listed in the Options section
 
966
                above. If run outside of Linux containers, these
 
967
                arguments are parsed from
 
968
                <filename>/proc/cmdline</filename>
 
969
                instead.</para></footnote>:</para>
952
970
 
953
971
                <variablelist>
954
972
                        <varlistentry>
1059
1077
                                above.</para></listitem>
1060
1078
                        </varlistentry>
1061
1079
 
 
1080
                        <varlistentry>
 
1081
                                <term><varname>systemd.setenv=</varname></term>
 
1082
 
 
1083
                                <listitem><para>Takes a string
 
1084
                                argument in the form
 
1085
                                VARIABLE=VALUE. May be used to set
 
1086
                                environment variables for the init
 
1087
                                process and all its children at boot
 
1088
                                time. May be used more than once to
 
1089
                                set multiple variables. If the equal
 
1090
                                sign and variable are missing unsets
 
1091
                                an environment variable which might be
 
1092
                                passed in from the initial ram
 
1093
                                disk.</para></listitem>
 
1094
                        </varlistentry>
 
1095
 
1062
1096
                </variablelist>
1063
1097
        </refsect1>
1064
1098
 
1079
1113
                        </varlistentry>
1080
1114
 
1081
1115
                        <varlistentry>
1082
 
                                <term><filename>/run/systemd/stdout-syslog-bridge</filename></term>
1083
 
 
1084
 
                                <listitem><para>Used internally by the
1085
 
                                <filename>systemd-stdout-syslog-bridge.service</filename>
1086
 
                                unit to connect STDOUT and/or STDERR
1087
 
                                of spawned processes to
1088
 
                                <citerefentry><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>
1089
 
                                or the kernel log buffer. This is an
1090
 
                                AF_UNIX stream
1091
 
                                socket.</para></listitem>
1092
 
                        </varlistentry>
1093
 
 
1094
 
                        <varlistentry>
1095
1116
                                <term><filename>/run/systemd/shutdownd</filename></term>
1096
1117
 
1097
1118
                                <listitem><para>Used internally by the