diff options
| author | Jonathan Bauer | 2014-01-30 11:08:31 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2014-01-30 11:08:31 +0100 |
| commit | 6a650df8c4ec834c03a51604942e32ec9c5741e7 (patch) | |
| tree | e54eb007b92269e6c4872770e62ef398ac347a8e /remote/modules/systemd/data/etc | |
| parent | [rfs-s31] append host info from dhcp instead of creating the file (diff) | |
| parent | [systemd] Clean up build file (diff) | |
| download | tm-scripts-6a650df8c4ec834c03a51604942e32ec9c5741e7.tar.gz tm-scripts-6a650df8c4ec834c03a51604942e32ec9c5741e7.tar.xz tm-scripts-6a650df8c4ec834c03a51604942e32ec9c5741e7.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Conflicts:
remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger
Diffstat (limited to 'remote/modules/systemd/data/etc')
| -rw-r--r-- | remote/modules/systemd/data/etc/systemd/system/network-interface@.service | 4 | ||||
| -rw-r--r-- | remote/modules/systemd/data/etc/systemd/system/network.target | 13 |
2 files changed, 2 insertions, 15 deletions
diff --git a/remote/modules/systemd/data/etc/systemd/system/network-interface@.service b/remote/modules/systemd/data/etc/systemd/system/network-interface@.service index 73cc6239..ea9cc56e 100644 --- a/remote/modules/systemd/data/etc/systemd/system/network-interface@.service +++ b/remote/modules/systemd/data/etc/systemd/system/network-interface@.service @@ -1,7 +1,7 @@ [Unit] Description=Brings interface %i up -Wants=udhcpc@%i.service -Before=udhcpc@%i.service +Wants=dhcpc@%i.service +Before=dhcpc@%i.service [Service] Type=simple diff --git a/remote/modules/systemd/data/etc/systemd/system/network.target b/remote/modules/systemd/data/etc/systemd/system/network.target deleted file mode 100644 index 0bc2a410..00000000 --- a/remote/modules/systemd/data/etc/systemd/system/network.target +++ /dev/null @@ -1,13 +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 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 - |