diff options
| author | Jonathan Bauer | 2014-02-27 12:09:08 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2014-02-27 12:09:08 +0100 |
| commit | 2f2d4ae0bed8bb01cd42e8168ef12b90da622f7f (patch) | |
| tree | 21a712fa8761f73d3da4c42d44e7825fad422ac6 /remote/modules | |
| parent | uhm (diff) | |
| parent | sdfoighsdihoi (diff) | |
| download | tm-scripts-2f2d4ae0bed8bb01cd42e8168ef12b90da622f7f.tar.gz tm-scripts-2f2d4ae0bed8bb01cd42e8168ef12b90da622f7f.tar.xz tm-scripts-2f2d4ae0bed8bb01cd42e8168ef12b90da622f7f.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/kdm/data/etc/systemd/system/kdm.service | 1 | ||||
| -rw-r--r-- | remote/modules/systemd/data/usr/lib/systemd/system/getty@.service | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/remote/modules/kdm/data/etc/systemd/system/kdm.service b/remote/modules/kdm/data/etc/systemd/system/kdm.service index e07ae6fc..da5e2729 100644 --- a/remote/modules/kdm/data/etc/systemd/system/kdm.service +++ b/remote/modules/kdm/data/etc/systemd/system/kdm.service @@ -4,6 +4,7 @@ Conflicts=getty@tty7.service After=systemd-user-sessions.service getty@tty7.service setup-slx-addon@nvidia_libs.service [Service] +ExecStartPre=-/opt/openslx/usr/bin/killall fbsplash ExecStart=/usr/bin/kdm -nodaemon Restart=always IgnoreSIGPIPE=no diff --git a/remote/modules/systemd/data/usr/lib/systemd/system/getty@.service b/remote/modules/systemd/data/usr/lib/systemd/system/getty@.service index 7e218d11..3586e04a 100644 --- a/remote/modules/systemd/data/usr/lib/systemd/system/getty@.service +++ b/remote/modules/systemd/data/usr/lib/systemd/system/getty@.service @@ -1,4 +1,5 @@ # This file is part of systemd. +# Patched for OpenSLX # # systemd is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as published by @@ -9,7 +10,7 @@ Description=Getty on %I Documentation=man:agetty(8) man:systemd-getty-generator(8) Documentation=http://0pointer.de/blog/projects/serial-console.html -After=systemd-user-sessions.service plymouth-quit-wait.service +After=systemd-user-sessions.service After=rc-local.service # If additional gettys are spawned during boot then we should make @@ -24,6 +25,7 @@ IgnoreOnIsolate=yes ConditionPathExists=/dev/tty0 [Service] +ExecStartPre=-/opt/openslx/usr/bin/killall fbsplash # the VT is cleared by TTYVTDisallocate ExecStart=-/sbin/agetty --noclear %I 38400 linux Type=idle @@ -45,5 +47,3 @@ Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETA # instead, to ensure that login terminates cleanly. KillSignal=SIGHUP -[Install] -Alias=getty.target.wants/getty@tty1.service |