diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | man/logind.conf.xml | 3 | ||||
| -rw-r--r-- | src/journal/journald-native.c | 2 | ||||
| -rw-r--r-- | src/sysv-generator/sysv-generator.c | 3 | ||||
| -rw-r--r-- | src/test/test-sizeof.c | 14 | ||||
| -rw-r--r-- | units/quotaon.service.in | 2 | ||||
| -rw-r--r-- | units/serial-getty@.service.m4 | 6 | ||||
| -rw-r--r-- | units/systemd-quotacheck.service.in | 2 |
8 files changed, 23 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 9a78488f8a..1cc657acca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2182,9 +2182,6 @@ test_selinux_LDADD = \ test_sizeof_SOURCES = \ src/test/test-sizeof.c -test_sizeof_LDADD = \ - libsystemd-shared.la - BUILT_SOURCES += \ src/test/test-hashmap-ordered.c diff --git a/man/logind.conf.xml b/man/logind.conf.xml index 994e0e1140..1d7b1becd0 100644 --- a/man/logind.conf.xml +++ b/man/logind.conf.xml @@ -261,7 +261,8 @@ <listitem><para>Controls whether actions that <command>systemd-logind</command> takes when the power and sleep keys and the lid switch are triggered are subject to high-level inhibitor locks ("shutdown", "sleep", "idle"). Low level inhibitor - locks ("handle-*-key"), are always honored, irrespective of this setting.</para> + locks ("handle-*-key" and "handle-lid-switch"), are always honored, + irrespective of this setting.</para> <para>These settings take boolean arguments. If <literal>no</literal>, the inhibitor locks taken by applications are respected. If <literal>yes</literal>, diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c index 3c03b83754..c9bf3832c7 100644 --- a/src/journal/journald-native.c +++ b/src/journal/journald-native.c @@ -279,7 +279,7 @@ void server_process_native_message( if (message) { if (s->forward_to_syslog) - server_forward_syslog(s, priority, identifier, message, ucred, tv); + server_forward_syslog(s, syslog_fixup_facility(priority), identifier, message, ucred, tv); if (s->forward_to_kmsg) server_forward_kmsg(s, priority, identifier, message, ucred); diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index 9fde9b1884..9828078443 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -389,6 +389,9 @@ static int handle_provides(SysvStub *s, unsigned line, const char *full_text, co r = strv_extend(&s->before, SPECIAL_NETWORK_TARGET); if (r < 0) return log_oom(); + r = strv_extend(&s->wants, SPECIAL_NETWORK_TARGET); + if (r < 0) + return log_oom(); } break; diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c index 8f99a13772..36389b7710 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c @@ -17,7 +17,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "log.h" +#include <stdio.h> + #include "time-util.h" /* Print information about various types. Useful when diagnosing @@ -26,10 +27,10 @@ #pragma GCC diagnostic ignored "-Wtype-limits" #define info(t) \ - log_info("%s → %zu bits%s", STRINGIFY(t), \ - sizeof(t)*CHAR_BIT, \ - strstr(STRINGIFY(t), "signed") ? "" : \ - ((t)-1 < (t)0 ? ", signed" : ", unsigned")); + printf("%s → %zu bits%s\n", STRINGIFY(t), \ + sizeof(t)*CHAR_BIT, \ + strstr(STRINGIFY(t), "signed") ? "" : \ + ((t)-1 < (t)0 ? ", signed" : ", unsigned")); int main(void) { info(char); @@ -39,6 +40,8 @@ int main(void) { info(unsigned); info(long unsigned); info(long long unsigned); + info(__syscall_ulong_t); + info(__syscall_slong_t); info(float); info(double); @@ -48,6 +51,7 @@ int main(void) { info(ssize_t); info(time_t); info(usec_t); + info(__time_t); return 0; } diff --git a/units/quotaon.service.in b/units/quotaon.service.in index 7d59a40195..f3e1e270c9 100644 --- a/units/quotaon.service.in +++ b/units/quotaon.service.in @@ -10,7 +10,7 @@ Description=Enable File System Quotas Documentation=man:quotaon(8) DefaultDependencies=no After=systemd-quotacheck.service -Before=local-fs.target shutdown.target +Before=remote-fs.target shutdown.target ConditionPathExists=@QUOTAON@ [Service] diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4 index 4522d0d2be..609c5b62ee 100644 --- a/units/serial-getty@.service.m4 +++ b/units/serial-getty@.service.m4 @@ -21,6 +21,12 @@ After=rc-local.service Before=getty.target IgnoreOnIsolate=yes +# IgnoreOnIsolate causes issues with sulogin, if someone isolates +# rescue.target or starts rescue.service from multi-user.target or +# graphical.target. +Conflicts=rescue.service +Before=rescue.service + [Service] ExecStart=-/sbin/agetty --keep-baud 115200,38400,9600 %I $TERM Type=idle diff --git a/units/systemd-quotacheck.service.in b/units/systemd-quotacheck.service.in index 5cb9bc3bc9..6b1999aa51 100644 --- a/units/systemd-quotacheck.service.in +++ b/units/systemd-quotacheck.service.in @@ -10,7 +10,7 @@ Description=File System Quota Check Documentation=man:systemd-quotacheck.service(8) DefaultDependencies=no After=systemd-remount-fs.service -Before=local-fs.target shutdown.target +Before=remote-fs.target shutdown.target ConditionPathExists=@QUOTACHECK@ [Service] |