diff --git a/.gitignore b/.gitignore
index 3b69eb46f9..8f30c5e0d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
/systemd-cat
/systemd-rc-local-generator
/libsystemd-id128.pc
-systemd-journalctl
+journalctl
systemd-journald
test-id128
test-journal
@@ -14,7 +14,7 @@ org.freedesktop.locale1.xml
libsystemd-daemon.pc
libsystemd-login.pc
test-login
-systemd-loginctl
+loginctl
systemd-localed
systemd-timedated
org.freedesktop.timedate1.xml
diff --git a/Makefile.am b/Makefile.am
index 32ec0e04ce..99ad9c0309 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -690,16 +690,22 @@ MANPAGES = \
man/systemd-cat.1 \
man/systemd-machine-id-setup.1 \
man/systemd-journald.conf.5 \
- man/systemd-journalctl.1
+ man/journalctl.1
MANPAGES_ALIAS = \
man/reboot.8 \
man/poweroff.8 \
- man/init.1
+ man/init.1 \
+ man/systemd-systemctl.1 \
+ man/systemd-loginctl.1 \
+ man/systemd-journalctl.1
man/reboot.8: man/halt.8
man/poweroff.8: man/halt.8
man/init.1: man/systemd.1
+man/systemd-systemctl.1: man/systemctl.1
+man/systemd-loginctl.1: man/loginctl.1
+man/systemd-journalctl.1: man/journalctl.1
XML_FILES = \
${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -979,6 +985,14 @@ systemctl_LDADD = \
libsystemd-id128.la \
$(DBUS_LIBS)
+systemctl-install-hook:
+ cd $(DESTDIR)$(rootbindir) && \
+ rm -f systemd-systemctl && \
+ $(LN_S) systemctl systemd-systemctl
+
+INSTALL_EXEC_HOOKS += \
+ systemctl-install-hook
+
systemd_notify_SOURCES = \
src/notify.c \
src/readahead/sd-readahead.c
@@ -1207,26 +1221,34 @@ systemd_cat_LDADD = \
libsystemd-basic.la \
libsystemd-journal.la
-systemd_journalctl_SOURCES = \
+journalctl_SOURCES = \
src/journal/journalctl.c \
src/pager.c \
src/logs-show.c
-systemd_journalctl_LDADD = \
+journalctl_LDADD = \
libsystemd-basic.la \
libsystemd-journal.la \
libsystemd-id128.la
if HAVE_XZ
-systemd_journalctl_SOURCES += \
+journalctl_SOURCES += \
src/journal/compress.c
-systemd_journalctl_CFLAGS = \
+journalctl_CFLAGS = \
$(AM_CFLAGS) \
$(XZ_CFLAGS)
-systemd_journalctl_LDADD += \
+journalctl_LDADD += \
$(XZ_LIBS)
endif
+journalctl-install-hook:
+ cd $(DESTDIR)$(rootbindir) && \
+ rm -f systemd-journalctl && \
+ $(LN_S) journalctl systemd-journalctl
+
+INSTALL_EXEC_HOOKS += \
+ journalctl-install-hook
+
test_journal_SOURCES = \
src/journal/test-journal.c \
src/journal/sd-journal.c \
@@ -1313,7 +1335,7 @@ rootlibexec_PROGRAMS += \
systemd-journald
rootbin_PROGRAMS += \
- systemd-journalctl
+ journalctl
bin_PROGRAMS += \
systemd-cat
@@ -1813,7 +1835,7 @@ rootlibexec_PROGRAMS += \
systemd-logind \
systemd-user-sessions
-systemd_loginctl_SOURCES = \
+loginctl_SOURCES = \
src/login/loginctl.c \
src/login/sysfs-show.c \
src/dbus-common.c \
@@ -1821,18 +1843,26 @@ systemd_loginctl_SOURCES = \
src/cgroup-util.c \
src/pager.c
-systemd_loginctl_CFLAGS = \
+loginctl_CFLAGS = \
$(AM_CFLAGS) \
$(DBUS_CFLAGS) \
$(UDEV_CFLAGS)
-systemd_loginctl_LDADD = \
+loginctl_LDADD = \
libsystemd-basic.la \
$(DBUS_LIBS) \
$(UDEV_LIBS)
rootbin_PROGRAMS += \
- systemd-loginctl
+ loginctl
+
+loginctl-install-hook:
+ cd $(DESTDIR)$(rootbindir) && \
+ rm -f systemd-loginctl && \
+ $(LN_S) loginctl systemd-loginctl
+
+INSTALL_EXEC_HOOKS += \
+ loginctl-install-hook
test_login_SOURCES = \
src/login/test-login.c
@@ -1997,7 +2027,7 @@ nodist_udevrules_DATA += \
MANPAGES += \
man/systemd-logind.conf.5 \
man/sd-login.7 \
- man/systemd-loginctl.1 \
+ man/loginctl.1 \
man/sd_login_monitor_new.3 \
man/sd_pid_get_session.3 \
man/sd_uid_get_state.3 \
diff --git a/TODO b/TODO
index 176c2a742c..7f19c3adcb 100644
--- a/TODO
+++ b/TODO
@@ -18,6 +18,10 @@ Bugfixes:
Features:
+* ensure that logind sets the syslog facility to AUTH when logging
+
+* when a service has the same env var set twice we actually store it twice and return that in systemctl show -p... We should only show the last setting
+
* add man page documenting all kernel cmdline options, including stuff like fsck.mode=
* show getty in container mode, not sulogin
diff --git a/man/systemd-journalctl.xml b/man/journalctl.xml
similarity index 96%
rename from man/systemd-journalctl.xml
rename to man/journalctl.xml
index 1441ecaca1..c4d2a7e0e8 100644
--- a/man/systemd-journalctl.xml
+++ b/man/journalctl.xml
@@ -21,10 +21,10 @@
along with systemd; If not, see .
-->
-
+
- systemd-journalctl
+ journalctl
systemd
@@ -38,25 +38,26 @@
- systemd-journalctl
+ journalctl
1
+ journalctl
systemd-journalctl
Query the systemd journal
- systemd-journalctl OPTIONS MATCH
+ journalctl OPTIONS MATCH
Description
- systemd-journalctl may be
+ journalctl may be
used to query the contents of the
systemd1
journal.
diff --git a/man/systemd-loginctl.xml b/man/loginctl.xml
similarity index 98%
rename from man/systemd-loginctl.xml
rename to man/loginctl.xml
index 6a282769a3..be72cc331a 100644
--- a/man/systemd-loginctl.xml
+++ b/man/loginctl.xml
@@ -21,10 +21,10 @@
along with systemd; If not, see .
-->
-
+
- systemd-loginctl
+ loginctl
systemd
@@ -38,25 +38,26 @@
- systemd-loginctl
+ loginctl
1
+ loginctl
systemd-loginctl
Control the systemd login manager
- systemd-loginctl OPTIONS COMMAND NAME
+ loginctl OPTIONS COMMAND NAME
Description
- systemd-loginctl may be used to
+ loginctl may be used to
introspect and control the state of the
systemd1
login manager.
diff --git a/man/systemctl.xml b/man/systemctl.xml
index c467ed8bf7..ffe0164008 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -44,6 +44,7 @@
systemctl
+ systemd-systemctl
Control the systemd system and service manager
@@ -448,7 +449,7 @@
formatting of the journal entries that
are shown. For the available choices
see
- systemd-journalctl1. Defaults
+ journalctl1. Defaults
to
short.
@@ -1179,8 +1180,8 @@
systemd1,
systemadm1,
- systemd-journalctl1,
- systemd-loginctl1,
+ journalctl1,
+ loginctl1,
systemd.unit5,
systemd.special7,
wall1
diff --git a/man/systemd-journald.conf.xml b/man/systemd-journald.conf.xml
index f3cd4db260..37dae68b36 100644
--- a/man/systemd-journald.conf.xml
+++ b/man/systemd-journald.conf.xml
@@ -246,7 +246,7 @@
See Also
systemd1,
- systemd-journalctl1,
+ journalctl1,
systemd.conf5
diff --git a/man/systemd-logind.conf.xml b/man/systemd-logind.conf.xml
index 4b0281503e..27c11c2904 100644
--- a/man/systemd-logind.conf.xml
+++ b/man/systemd-logind.conf.xml
@@ -167,7 +167,7 @@
See Also
systemd1,
- systemd-loginctl1,
+ loginctl1,
systemd.conf5
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index ac0f89fb85..e6f49c9fd0 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -397,7 +397,7 @@
dmesg1.
connects it with the journal which is
accessible via
- systemd-journalctl1
+ journalctl1
(Note that everything that is written
to syslog or kmsg is implicitly stored
in the journal as well, those options
@@ -1094,6 +1094,7 @@
systemd1,
systemctl8,
+ journalctl8,
systemd.unit5,
systemd.service5,
systemd.socket5,