diff options
| author | Simon Rettberg | 2013-09-13 16:55:32 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-09-30 13:22:07 +0200 |
| commit | 21250f3658886c81e8a90e269177a5bd33b92e27 (patch) | |
| tree | 8f8150ca286fdea1889c0a3d0198ed80aedddcc4 /remote/modules | |
| parent | [blacklists] 'includes for gnome (diff) | |
| download | tm-scripts-21250f3658886c81e8a90e269177a5bd33b92e27.tar.gz tm-scripts-21250f3658886c81e8a90e269177a5bd33b92e27.tar.xz tm-scripts-21250f3658886c81e8a90e269177a5bd33b92e27.zip | |
[stage32] Some work on system startup regarding systemd dependencies - still somewhat messy, but already way more restricted and predictable than before when it comes to ordering
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/kdm/data/etc/systemd/system/kdm.service | 5 | ||||
| -rw-r--r-- | remote/modules/systemd/data/etc/systemd/system/network.target | 13 | ||||
| -rw-r--r-- | remote/modules/systemd/systemd.conf | 3 |
3 files changed, 15 insertions, 6 deletions
diff --git a/remote/modules/kdm/data/etc/systemd/system/kdm.service b/remote/modules/kdm/data/etc/systemd/system/kdm.service index 14ff7457..9882459f 100644 --- a/remote/modules/kdm/data/etc/systemd/system/kdm.service +++ b/remote/modules/kdm/data/etc/systemd/system/kdm.service @@ -1,12 +1,9 @@ [Unit] Description=KDM Display Manager Conflicts=getty@tty7.service -After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service +After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service activate-nss-ldap.service [Service] ExecStart=/usr/bin/kdm -nodaemon Restart=always IgnoreSIGPIPE=no - -[Install] -Alias=display-manager.service diff --git a/remote/modules/systemd/data/etc/systemd/system/network.target b/remote/modules/systemd/data/etc/systemd/system/network.target new file mode 100644 index 00000000..0bc2a410 --- /dev/null +++ b/remote/modules/systemd/data/etc/systemd/system/network.target @@ -0,0 +1,13 @@ +# This file is part of systemd. +# +# 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 +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Network +Documentation=man:systemd.special(7) +Documentation=http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget +ConditionPathExists=/run/udhcpc/network-ready + diff --git a/remote/modules/systemd/systemd.conf b/remote/modules/systemd/systemd.conf index 3cb6196a..1a038647 100644 --- a/remote/modules/systemd/systemd.conf +++ b/remote/modules/systemd/systemd.conf @@ -4,7 +4,6 @@ REQUIRED_LIBKMOD_VERSION="kmod-14" REQUIRED_LIBKMOD_URL="http://www.kernel.org/pub/linux/utils/kernel/kmod/${REQUIRED_LIBKMOD_VERSION}.tar.gz" REQUIRED_DISABLED_SERVICES=" tmp.mount - time-sync.target systemd-random-seed-save.service systemd-random-seed-load.service systemd-readahead-collect.service @@ -24,7 +23,7 @@ REQUIRED_DISABLED_SERVICES=" nss-user-lookup.target systemd-initctl.service systemd-initctl.socket - swap.target + umount.target " REQUIRED_BINARIES=" journalctl |