Merge commit 'v28'

18 files changed, 36 insertions, 58 deletions

diff --git a/units/frugalware/display-manager.service b/units/frugalware/display-manager.service
index a092c56de6..e61422587a 100644
--- a/units/frugalware/display-manager.service
+++ b/units/frugalware/display-manager.service
@@ -9,9 +9,6 @@
 Description=Display Manager
 After=syslog.target local.service systemd-user-sessions.service
 
-Conflicts=splashy-quit.service
-After=splashy-quit.service
-
 [Service]
 EnvironmentFile=/etc/sysconfig/desktop
 ExecStart=/bin/bash -c "exec ${desktop}"
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index a9733a60d6..bfceb39fde 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -36,6 +36,10 @@ ExecStart=-/sbin/agetty %I 38400
 Restart=always
 RestartSec=0
 UtmpIdentifier=%I
+TTYPath=/dev/%I
+TTYReset=yes
+TTYVHangup=yes
+TTYVTDisallocate=yes
 KillMode=process
 
 # Unset locale for the console getty since the console has problems
diff --git a/units/hwclock-load.service b/units/hwclock-load.service
deleted file mode 100644
index f278a671a3..0000000000
--- a/units/hwclock-load.service
+++ /dev/null
@@ -1,34 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Apply System Clock UTC Offset
-DefaultDependencies=no
-Wants=time-sync.target
-Conflicts=shutdown.target
-After=systemd-readahead-collect.service systemd-readahead-replay.service
-Before=sysinit.target shutdown.target udev.service time-sync.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/sbin/hwclock --systz
-StandardOutput=syslog
-
-# Note the weird semantics of hwclock and the kernel here: the first
-# settimeofday() invocation from userspace is special and may be used
-# to set the offset from UTC of the system clock. It is independent
-# of any specific RTC device. This is mostly a crufty hack to support
-# legacy operating systems which insist on storing local time in the
-# RTC.
-
-# Note that we do not run --hctosys here, we assume the kernel
-# includes a compiled in RTC module which is used to initialize the
-# system time as part of kernel setup.
-
-[Install]
-WantedBy=sysinit.target
diff --git a/units/hwclock-save.service b/units/hwclock-save.service
deleted file mode 100644
index dedee767a2..0000000000
--- a/units/hwclock-save.service
+++ /dev/null
@@ -1,17 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Update RTC With System Clock
-DefaultDependencies=no
-After=hwclock-load.service
-Before=shutdown.target
-Conflicts=hwclock-load.service
-
-[Service]
-Type=oneshot
-ExecStart=/sbin/hwclock --systohc
diff --git a/units/plymouth-halt.service b/units/plymouth-halt.service
index 962d829fff..2e194b360e 100644
--- a/units/plymouth-halt.service
+++ b/units/plymouth-halt.service
@@ -10,6 +10,7 @@ Description=Show Plymouth Halt Screen
 After=getty@tty1.service prefdm.service plymouth-start.service
 Before=halt.service
 DefaultDependencies=no
+ConditionKernelCommandLine=!plymouth.enable=0
 
 [Service]
 ExecStart=/sbin/plymouthd --mode=shutdown
diff --git a/units/plymouth-kexec.service b/units/plymouth-kexec.service
index 0d7450feea..919c3f1294 100644
--- a/units/plymouth-kexec.service
+++ b/units/plymouth-kexec.service
@@ -10,6 +10,7 @@ Description=Show Plymouth Reboot with kexec Screen
 After=getty@tty1.service prefdm.service plymouth-start.service
 Before=kexec.service
 DefaultDependencies=no
+ConditionKernelCommandLine=!plymouth.enable=0
 
 [Service]
 ExecStart=/sbin/plymouthd --mode=shutdown
diff --git a/units/plymouth-poweroff.service b/units/plymouth-poweroff.service
index d4979df1e0..8fcff3bab1 100644
--- a/units/plymouth-poweroff.service
+++ b/units/plymouth-poweroff.service
@@ -10,6 +10,7 @@ Description=Show Plymouth Power Off Screen
 After=getty@tty1.service prefdm.service plymouth-start.service
 Before=poweroff.service
 DefaultDependencies=no
+ConditionKernelCommandLine=!plymouth.enable=0
 
 [Service]
 ExecStart=/sbin/plymouthd --mode=shutdown
diff --git a/units/plymouth-reboot.service b/units/plymouth-reboot.service
index 7304a5fba2..fb65bcc836 100644
--- a/units/plymouth-reboot.service
+++ b/units/plymouth-reboot.service
@@ -10,6 +10,7 @@ Description=Show Plymouth Reboot Screen
 After=getty@tty1.service prefdm.service plymouth-start.service
 Before=reboot.service
 DefaultDependencies=no
+ConditionKernelCommandLine=!plymouth.enable=0
 
 [Service]
 ExecStart=/sbin/plymouthd --mode=shutdown
diff --git a/units/plymouth-start.service b/units/plymouth-start.service
index 10d03c6c62..f618257a93 100644
--- a/units/plymouth-start.service
+++ b/units/plymouth-start.service
@@ -14,6 +14,7 @@ Before=systemd-ask-password-plymouth.service
 
 # Dracut informs us with this flag file if plymouth is already running
 ConditionPathExists=!/run/plymouth/pid
+ConditionKernelCommandLine=!plymouth.enable=0
 
 [Service]
 ExecStart=/sbin/plymouthd --mode=boot --pid-file=/run/plymouth/pid
diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
index 91f49ef380..acbbcbb0cb 100644
--- a/units/proc-sys-fs-binfmt_misc.automount
+++ b/units/proc-sys-fs-binfmt_misc.automount
@@ -9,6 +9,7 @@
 Description=Arbitrary Executable File Formats File System Automount Point
 DefaultDependencies=no
 Before=sysinit.target
+ConditionPathExists=/proc/sys/fs/binfmt_misc
 
 [Automount]
 Where=/proc/sys/fs/binfmt_misc
diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
index 8b4f0fb9d5..082290cb8b 100644
--- a/units/serial-getty@.service.m4
+++ b/units/serial-getty@.service.m4
@@ -36,6 +36,9 @@ ExecStart=-/sbin/agetty -s %I 115200,38400,9600
 Restart=always
 RestartSec=0
 UtmpIdentifier=%I
+TTYPath=/dev/%I
+TTYReset=yes
+TTYVHangup=yes
 KillMode=process
 
 # Some login implementations ignore SIGTERM, so we send SIGHUP
diff --git a/units/sys-kernel-debug.automount b/units/sys-kernel-debug.automount
index f856a87930..2f2de9829f 100644
--- a/units/sys-kernel-debug.automount
+++ b/units/sys-kernel-debug.automount
@@ -9,6 +9,7 @@
 Description=Debug File System Automount Point
 DefaultDependencies=no
 Before=sysinit.target
+ConditionPathExists=/sys/kernel/debug
 
 [Automount]
 Where=/sys/kernel/debug
diff --git a/units/sys-kernel-security.automount b/units/sys-kernel-security.automount
index cd13e4a88a..b7b16e19aa 100644
--- a/units/sys-kernel-security.automount
+++ b/units/sys-kernel-security.automount
@@ -9,6 +9,7 @@
 Description=Security File System Automount Point
 DefaultDependencies=no
 Before=sysinit.target
+ConditionPathExists=/sys/kernel/security
 
 [Automount]
 Where=/sys/kernel/security
diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
index 0bf6df2011..d43497c151 100644
--- a/units/systemd-binfmt.service.in
+++ b/units/systemd-binfmt.service.in
@@ -11,7 +11,10 @@ DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service proc-sys-fs-binfmt_misc.automount
 Before=sysinit.target shutdown.target
-ConditionDirectoryNotEmpty=/etc/binfmt.d
+ConditionDirectoryNotEmpty=|/usr/lib/binfmt.d
+ConditionDirectoryNotEmpty=|/usr/local/lib/binfmt.d
+ConditionDirectoryNotEmpty=|/etc/binfmt.d
+ConditionDirectoryNotEmpty=|/run/binfmt.d
 
 [Service]
 Type=oneshot
diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
index 739729e692..5dc373d208 100644
--- a/units/systemd-modules-load.service.in
+++ b/units/systemd-modules-load.service.in
@@ -11,7 +11,11 @@ DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service
 Before=sysinit.target shutdown.target
-ConditionDirectoryNotEmpty=/etc/modules-load.d
+ConditionDirectoryNotEmpty=|/lib/modules-load.d
+ConditionDirectoryNotEmpty=|/usr/lib/modules-load.d
+ConditionDirectoryNotEmpty=|/usr/local/lib/modules-load.d
+ConditionDirectoryNotEmpty=|/etc/modules-load.d
+ConditionDirectoryNotEmpty=|/run/modules-load.d
 
 [Service]
 Type=oneshot
diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in
index ea78230d7c..6d53422630 100644
--- a/units/systemd-sysctl.service.in
+++ b/units/systemd-sysctl.service.in
@@ -12,7 +12,11 @@ Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service
 Before=sysinit.target shutdown.target
 ConditionPathExists=|/etc/sysctl.conf
+ConditionDirectoryNotEmpty=|/lib/sysctl.d
+ConditionDirectoryNotEmpty=|/usr/lib/sysctl.d
+ConditionDirectoryNotEmpty=|/usr/local/lib/sysctl.d
 ConditionDirectoryNotEmpty=|/etc/sysctl.d
+ConditionDirectoryNotEmpty=|/run/sysctl.d
 
 [Service]
 Type=oneshot
diff --git a/units/systemd-tmpfiles-clean.service.in b/units/systemd-tmpfiles-clean.service.in
index 002daf661b..3c8e72ebf5 100644
--- a/units/systemd-tmpfiles-clean.service.in
+++ b/units/systemd-tmpfiles-clean.service.in
@@ -11,7 +11,10 @@ DefaultDependencies=no
 Wants=local-fs.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
 Before=sysinit.target shutdown.target
-ConditionPathExists=/etc/tmpfiles.d
+ConditionDirectoryNotEmpty=|/usr/lib/tmpfiles.d
+ConditionDirectoryNotEmpty=|/usr/local/lib/tmpfiles.d
+ConditionDirectoryNotEmpty=|/etc/tmpfiles.d
+ConditionDirectoryNotEmpty=|/run/tmpfiles.d
 
 [Service]
 Type=oneshot
diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in
index b43f6f5a04..f90121e12e 100644
--- a/units/systemd-tmpfiles-setup.service.in
+++ b/units/systemd-tmpfiles-setup.service.in
@@ -11,7 +11,10 @@ DefaultDependencies=no
 Wants=local-fs.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
 Before=sysinit.target shutdown.target
-ConditionPathExists=/etc/tmpfiles.d
+ConditionDirectoryNotEmpty=|/usr/lib/tmpfiles.d
+ConditionDirectoryNotEmpty=|/usr/local/lib/tmpfiles.d
+ConditionDirectoryNotEmpty=|/etc/tmpfiles.d
+ConditionDirectoryNotEmpty=|/run/tmpfiles.d
 
 [Service]
 Type=oneshot