Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 482214 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-55 / +55 lines)
Line  Link Here
0
-- a/src/core/manager.c
0
++ b/src/core/manager.c
Lines 425-443 Link Here
425
                        SIGRTMIN+4,  /* systemd: start poweroff.target */
425
                        SIGRTMIN+4,  /* systemd: start poweroff.target */
426
                        SIGRTMIN+5,  /* systemd: start reboot.target */
426
                        SIGRTMIN+5,  /* systemd: start reboot.target */
427
                        SIGRTMIN+6,  /* systemd: start kexec.target */
427
                        SIGRTMIN+6,  /* systemd: start kexec.target */
428
                        SIGRTMIN+13, /* systemd: Immediate halt */
428
                        SIGRTMIN+7, /* systemd: Immediate halt */
429
                        SIGRTMIN+14, /* systemd: Immediate poweroff */
429
                        SIGRTMIN+8, /* systemd: Immediate poweroff */
430
                        SIGRTMIN+15, /* systemd: Immediate reboot */
430
                        SIGRTMIN+9, /* systemd: Immediate reboot */
431
                        SIGRTMIN+16, /* systemd: Immediate kexec */
431
                        SIGRTMIN+10, /* systemd: Immediate kexec */
432
                        SIGRTMIN+20, /* systemd: enable status messages */
432
                        SIGRTMIN+11, /* systemd: enable status messages */
433
                        SIGRTMIN+21, /* systemd: disable status messages */
433
                        SIGRTMIN+12, /* systemd: disable status messages */
434
                        SIGRTMIN+22, /* systemd: set log level to LOG_DEBUG */
434
                        SIGRTMIN+13, /* systemd: set log level to LOG_DEBUG */
435
                        SIGRTMIN+23, /* systemd: set log level to LOG_INFO */
435
                        SIGRTMIN+14, /* systemd: set log level to LOG_INFO */
436
                        SIGRTMIN+24, /* systemd: Immediate exit (--user only) */
436
                        SIGRTMIN+15, /* systemd: Immediate exit (--user only) */
437
                        SIGRTMIN+26, /* systemd: set log target to journal-or-kmsg */
437
                        SIGRTMIN+16, /* systemd: set log target to journal-or-kmsg */
438
                        SIGRTMIN+27, /* systemd: set log target to console */
438
                        SIGRTMIN+17, /* systemd: set log target to console */
439
                        SIGRTMIN+28, /* systemd: set log target to kmsg */
439
                        SIGRTMIN+18, /* systemd: set log target to kmsg */
440
                        SIGRTMIN+29, /* systemd: set log target to syslog-or-kmsg */
440
                        SIGRTMIN+19, /* systemd: set log target to syslog-or-kmsg */
441
                        -1);
441
                        -1);
442
        assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0);
442
        assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0);
443
443
444
-- a/man/systemd.xml
444
++ b/man/systemd.xml
Lines 794-824 Link Here
794
                        </varlistentry>
794
                        </varlistentry>
795
795
796
                        <varlistentry>
796
                        <varlistentry>
797
                                <term><constant>SIGRTMIN+13</constant></term>
797
                                <term><constant>SIGRTMIN+7</constant></term>
798
798
799
                                <listitem><para>Immediately halts the machine.</para></listitem>
799
                                <listitem><para>Immediately halts the machine.</para></listitem>
800
                        </varlistentry>
800
                        </varlistentry>
801
801
802
                        <varlistentry>
802
                        <varlistentry>
803
                                <term><constant>SIGRTMIN+14</constant></term>
803
                                <term><constant>SIGRTMIN+8</constant></term>
804
804
805
                                <listitem><para>Immediately powers off the machine.</para></listitem>
805
                                <listitem><para>Immediately powers off the machine.</para></listitem>
806
                        </varlistentry>
806
                        </varlistentry>
807
807
808
                        <varlistentry>
808
                        <varlistentry>
809
                                <term><constant>SIGRTMIN+15</constant></term>
809
                                <term><constant>SIGRTMIN+9</constant></term>
810
810
811
                                <listitem><para>Immediately reboots the machine.</para></listitem>
811
                                <listitem><para>Immediately reboots the machine.</para></listitem>
812
                        </varlistentry>
812
                        </varlistentry>
813
813
814
                        <varlistentry>
814
                        <varlistentry>
815
                                <term><constant>SIGRTMIN+16</constant></term>
815
                                <term><constant>SIGRTMIN+10</constant></term>
816
816
817
                                <listitem><para>Immediately reboots the machine with kexec.</para></listitem>
817
                                <listitem><para>Immediately reboots the machine with kexec.</para></listitem>
818
                        </varlistentry>
818
                        </varlistentry>
819
819
820
                        <varlistentry>
820
                        <varlistentry>
821
                                <term><constant>SIGRTMIN+20</constant></term>
821
                                <term><constant>SIGRTMIN+11</constant></term>
822
822
823
                                <listitem><para>Enables display of
823
                                <listitem><para>Enables display of
824
                                status messages on the console, as
824
                                status messages on the console, as
Lines 829-835 Link Here
829
                        </varlistentry>
829
                        </varlistentry>
830
830
831
                        <varlistentry>
831
                        <varlistentry>
832
                                <term><constant>SIGRTMIN+21</constant></term>
832
                                <term><constant>SIGRTMIN+12</constant></term>
833
833
834
                                <listitem><para>Disables display of
834
                                <listitem><para>Disables display of
835
                                status messages on the console, as
835
                                status messages on the console, as
Lines 840-862 Link Here
840
                        </varlistentry>
840
                        </varlistentry>
841
841
842
                        <varlistentry>
842
                        <varlistentry>
843
                                <term><constant>SIGRTMIN+22</constant></term>
843
                                <term><constant>SIGRTMIN+13</constant></term>
844
                                <term><constant>SIGRTMIN+23</constant></term>
844
                                <term><constant>SIGRTMIN+14</constant></term>
845
845
846
                                <listitem><para>Sets the log level to
846
                                <listitem><para>Sets the log level to
847
                                <literal>debug</literal>
847
                                <literal>debug</literal>
848
                                (or <literal>info</literal> on
848
                                (or <literal>info</literal> on
849
                                <constant>SIGRTMIN+23</constant>), as
849
                                <constant>SIGRTMIN+14</constant>), as
850
                                controlled via
850
                                controlled via
851
                                <varname>systemd.log_level=debug</varname>
851
                                <varname>systemd.log_level=debug</varname>
852
                                (or <varname>systemd.log_level=info</varname>
852
                                (or <varname>systemd.log_level=info</varname>
853
                                on <constant>SIGRTMIN+23</constant>) on
853
                                on <constant>SIGRTMIN+14</constant>) on
854
                                the kernel command
854
                                the kernel command
855
                                line.</para></listitem>
855
                                line.</para></listitem>
856
                        </varlistentry>
856
                        </varlistentry>
857
857
858
                        <varlistentry>
858
                        <varlistentry>
859
                                <term><constant>SIGRTMIN+24</constant></term>
859
                                <term><constant>SIGRTMIN+15</constant></term>
860
860
861
                                <listitem><para>Immediately exits the
861
                                <listitem><para>Immediately exits the
862
                                manager (only available for --user
862
                                manager (only available for --user
Lines 864-891 Link Here
864
                        </varlistentry>
864
                        </varlistentry>
865
865
866
                        <varlistentry>
866
                        <varlistentry>
867
                                <term><constant>SIGRTMIN+26</constant></term>
867
                                <term><constant>SIGRTMIN+16</constant></term>
868
                                <term><constant>SIGRTMIN+27</constant></term>
868
                                <term><constant>SIGRTMIN+17</constant></term>
869
                                <term><constant>SIGRTMIN+28</constant></term>
869
                                <term><constant>SIGRTMIN+18</constant></term>
870
                                <term><constant>SIGRTMIN+29</constant></term>
870
                                <term><constant>SIGRTMIN+19</constant></term>
871
871
872
                                <listitem><para>Sets the log level to
872
                                <listitem><para>Sets the log level to
873
                                <literal>journal-or-kmsg</literal>
873
                                <literal>journal-or-kmsg</literal>
874
                                (or <literal>console</literal> on
874
                                (or <literal>console</literal> on
875
                                <constant>SIGRTMIN+27</constant>,
875
                                <constant>SIGRTMIN+17</constant>,
876
                                <literal>kmsg</literal> on
876
                                <literal>kmsg</literal> on
877
                                <constant>SIGRTMIN+28</constant>,
877
                                <constant>SIGRTMIN+18</constant>,
878
                                or <literal>syslog-or-kmsg</literal>
878
                                or <literal>syslog-or-kmsg</literal>
879
                                on <constant>SIGRTMIN+29</constant>), as
879
                                on <constant>SIGRTMIN+19</constant>), as
880
                                controlled via
880
                                controlled via
881
                                <varname>systemd.log_target=journal-or-kmsg</varname>
881
                                <varname>systemd.log_target=journal-or-kmsg</varname>
882
                                (or <varname>systemd.log_target=console</varname>
882
                                (or <varname>systemd.log_target=console</varname>
883
                                on <constant>SIGRTMIN+27</constant>,
883
                                on <constant>SIGRTMIN+17</constant>,
884
                                <varname>systemd.log_target=kmsg</varname>
884
                                <varname>systemd.log_target=kmsg</varname>
885
                                on <constant>SIGRTMIN+28</constant>,
885
                                on <constant>SIGRTMIN+18</constant>,
886
                                or
886
                                or
887
                                <varname>systemd.log_target=syslog-or-kmsg</varname>
887
                                <varname>systemd.log_target=syslog-or-kmsg</varname>
888
                                on <constant>SIGRTMIN+29</constant>) on
888
                                on <constant>SIGRTMIN+19</constant>) on
889
                                the kernel command
889
                                the kernel command
890
                                line.</para></listitem>
890
                                line.</para></listitem>
891
                        </varlistentry>
891
                        </varlistentry>
892
-- a/man/systemd.directives.xml
892
++ b/man/systemd.directives.xml
Lines 1691-1731 Link Here
1691
1691
1692
<varlistentry><term><constant>SIGRTMIN+1</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1692
<varlistentry><term><constant>SIGRTMIN+1</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1693
1693
1694
<varlistentry><term><constant>SIGRTMIN+13</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1694
<varlistentry><term><constant>SIGRTMIN+2</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1695
1695
1696
<varlistentry><term><constant>SIGRTMIN+14</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1696
<varlistentry><term><constant>SIGRTMIN+3</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1697
1697
1698
<varlistentry><term><constant>SIGRTMIN+15</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1698
<varlistentry><term><constant>SIGRTMIN+4</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1699
1699
1700
<varlistentry><term><constant>SIGRTMIN+16</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1700
<varlistentry><term><constant>SIGRTMIN+5</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1701
1701
1702
<varlistentry><term><constant>SIGRTMIN+2</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1702
<varlistentry><term><constant>SIGRTMIN+6</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1703
1703
1704
<varlistentry><term><constant>SIGRTMIN+20</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1704
<varlistentry><term><constant>SIGRTMIN+7</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1705
1705
1706
<varlistentry><term><constant>SIGRTMIN+21</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1706
<varlistentry><term><constant>SIGRTMIN+8</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1707
1707
1708
<varlistentry><term><constant>SIGRTMIN+22</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1708
<varlistentry><term><constant>SIGRTMIN+9</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1709
1709
1710
<varlistentry><term><constant>SIGRTMIN+23</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1710
<varlistentry><term><constant>SIGRTMIN+10</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1711
1711
1712
<varlistentry><term><constant>SIGRTMIN+24</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1712
<varlistentry><term><constant>SIGRTMIN+11</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1713
1713
1714
<varlistentry><term><constant>SIGRTMIN+26</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1714
<varlistentry><term><constant>SIGRTMIN+12</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1715
1715
1716
<varlistentry><term><constant>SIGRTMIN+27</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1716
<varlistentry><term><constant>SIGRTMIN+13</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1717
1717
1718
<varlistentry><term><constant>SIGRTMIN+28</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1718
<varlistentry><term><constant>SIGRTMIN+14</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1719
1719
1720
<varlistentry><term><constant>SIGRTMIN+29</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1720
<varlistentry><term><constant>SIGRTMIN+15</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1721
1721
1722
<varlistentry><term><constant>SIGRTMIN+3</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1722
<varlistentry><term><constant>SIGRTMIN+16</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1723
1723
1724
<varlistentry><term><constant>SIGRTMIN+4</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1724
<varlistentry><term><constant>SIGRTMIN+17</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1725
1725
1726
<varlistentry><term><constant>SIGRTMIN+5</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1726
<varlistentry><term><constant>SIGRTMIN+18</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1727
1727
1728
<varlistentry><term><constant>SIGRTMIN+6</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1728
<varlistentry><term><constant>SIGRTMIN+19</constant></term><listitem><para><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1729
1729
1730
<varlistentry><term><constant>SIGSTOP</constant></term><listitem><para><citerefentry><refentrytitle>loginctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1730
<varlistentry><term><constant>SIGSTOP</constant></term><listitem><para><citerefentry><refentrytitle>loginctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry></para></listitem></varlistentry>
1731
1731

Return to bug 482214