[systemd-commits] 5 commits - Makefile.am rules/99-systemd.rules.in src/journal units/getty at .service.m4
Lennart Poettering
lennart at kemper.freedesktop.org
Thu Apr 12 08:54:28 PDT 2012
Makefile.am | 39 +++++++++++++++++++++++----------------
rules/99-systemd.rules.in | 1 -
src/journal/journal-send.c | 5 ++---
units/getty at .service.m4 | 8 ++++++--
4 files changed, 31 insertions(+), 22 deletions(-)
New commits:
commit 4fc5568804ef50d9cc857eee86012d388620edd3
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Apr 12 17:53:19 2012 +0200
machine-id-setup: avoid cyclic dependency, built twice instead
diff --git a/Makefile.am b/Makefile.am
index 61891d4..edf92e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -566,8 +566,6 @@ libsystemd_shared_la_SOURCES = \
src/shared/spawn-ask-password-agent.h \
src/shared/mount-setup.c \
src/shared/mount-setup.h \
- src/shared/machine-id-setup.c \
- src/shared/machine-id-setup.h \
src/shared/loopback-setup.h \
src/shared/loopback-setup.c \
src/shared/specifier.c \
@@ -761,6 +759,8 @@ libsystemd_core_la_SOURCES = \
src/core/locale-setup.c \
src/core/hostname-setup.c \
src/core/hostname-setup.h \
+ src/shared/machine-id-setup.c \
+ src/shared/machine-id-setup.h \
src/core/fdset.c \
src/core/fdset.h \
src/core/condition.c \
@@ -1026,7 +1026,9 @@ systemd_tmpfiles_LDADD = \
# ------------------------------------------------------------------------------
systemd_machine_id_setup_SOURCES = \
- src/machine-id-setup/machine-id-setup-main.c
+ src/machine-id-setup/machine-id-setup-main.c \
+ src/shared/machine-id-setup.c \
+ src/shared/machine-id-setup.h
systemd_machine_id_setup_LDADD = \
libsystemd-label.la \
commit 25d042e81516246b1ebf706a57c47ac19abb0b8a
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Apr 12 17:43:33 2012 +0200
journal: fix missing variable initialization
diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
index 4c9753c..7a948a7 100644
--- a/src/journal/journal-send.c
+++ b/src/journal/journal-send.c
@@ -97,7 +97,7 @@ _public_ int sd_journal_printv(int priority, const char *format, va_list ap) {
}
static int fill_iovec_sprintf(const char *format, va_list ap, int extra, struct iovec **_iov) {
- int r, n = 0, i, j;
+ int r, n = 0, i = 0, j;
struct iovec *iov = NULL;
int saved_errno;
@@ -113,8 +113,7 @@ static int fill_iovec_sprintf(const char *format, va_list ap, int extra, struct
}
i = extra;
- } else
- i = 0;
+ }
while (format) {
struct iovec *c;
commit 41e5171419f5f9c08a338ea8b2ab8ea89c23c4ab
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Apr 12 17:42:09 2012 +0200
build-sys: split off logs-show into its own convenience library
diff --git a/Makefile.am b/Makefile.am
index 813ced2..61891d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -554,8 +554,6 @@ libsystemd_shared_la_SOURCES = \
src/shared/socket-util.h \
src/shared/cgroup-util.c \
src/shared/cgroup-util.h \
- src/shared/logs-show.c \
- src/shared/logs-show.h \
src/shared/cgroup-show.c \
src/shared/cgroup-show.h \
src/shared/unit-name.c \
@@ -628,6 +626,21 @@ libsystemd_label_la_LIBADD = \
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
+ libsystemd-logs.la
+
+libsystemd_logs_la_SOURCES = \
+ src/shared/logs-show.c \
+ src/shared/logs-show.h
+
+libsystemd_logs_la_CFLAGS = \
+ $(AM_CFLAGS)
+
+libsystemd_logs_la_LIBADD = \
+ libsystemd-journal.la \
+ libsystemd-id128.la
+
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
libsystemd-capability.la
libsystemd_capability_la_SOURCES = \
@@ -1114,6 +1127,7 @@ systemctl_LDADD = \
libsystemd-journal.la \
libsystemd-id128.la \
libsystemd-dbus.la \
+ libsystemd-logs.la
$(DBUS_LIBS)
# ------------------------------------------------------------------------------
@@ -1998,17 +2012,8 @@ journalctl_SOURCES = \
journalctl_LDADD = \
libsystemd-shared.la \
libsystemd-journal.la \
- libsystemd-id128.la
-
-if HAVE_XZ
-journalctl_SOURCES += \
- src/journal/compress.c
-journalctl_CFLAGS = \
- $(AM_CFLAGS) \
- $(XZ_CFLAGS)
-journalctl_LDADD += \
- $(XZ_LIBS)
-endif
+ libsystemd-id128.la \
+ libsystemd-logs.la
test_journal_SOURCES = \
src/journal/test-journal.c \
commit 8ef58b3efcbafe062e0c2c2531839c1e583b81fd
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Apr 12 17:31:26 2012 +0200
getty: skip VC gettys if the VC subsystem is not available
diff --git a/units/getty at .service.m4 b/units/getty at .service.m4
index c09722f..17c76f5 100644
--- a/units/getty at .service.m4
+++ b/units/getty at .service.m4
@@ -33,6 +33,11 @@ After=rc-local.service
Before=getty.target
IgnoreOnIsolate=yes
+# On systems without virtual consoles, don't start any getty. (Note
+# that serial gettys are covered by serial-getty at .service, not this
+# unit
+ConditionPathExists=/dev/tty0
+
[Service]
Environment=TERM=linux
ExecStart=-/sbin/agetty %I 38400
commit 88e995fd720a93460e7c3f38ac24512e6d96b3e8
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Apr 12 17:29:42 2012 +0200
getty: VC devices are always available, we don't need to wait until they show up
diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
index 1d53735..e2e7292 100644
--- a/rules/99-systemd.rules.in
+++ b/rules/99-systemd.rules.in
@@ -7,7 +7,6 @@
ACTION=="remove", GOTO="systemd_end"
-SUBSYSTEM=="tty", KERNEL=="tty[0-9]|tty1[0-2]", TAG+="systemd"
SUBSYSTEM=="tty", KERNEL=="tty[a-zA-Z]*|hvc*|xvc*|hvsi*", TAG+="systemd"
KERNEL=="vport*", TAG+="systemd"
diff --git a/units/getty at .service.m4 b/units/getty at .service.m4
index 762fbfe..c09722f 100644
--- a/units/getty at .service.m4
+++ b/units/getty at .service.m4
@@ -7,8 +7,7 @@
[Unit]
Description=Getty on %I
-BindTo=dev-%i.device
-After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
+After=systemd-user-sessions.service plymouth-quit-wait.service
m4_ifdef(`TARGET_FEDORA',
After=rc-local.service
)m4_dnl
More information about the systemd-commits
mailing list