diff options
| author | Simon Rettberg | 2014-01-29 21:10:04 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2014-01-29 21:10:04 +0100 |
| commit | b77ffba65617c4001e85a31dc9673d0abe481fb8 (patch) | |
| tree | 40033a4e82cc9e8e3b13889c4aec3aa5f1acd3ee /remote/rootfs/rootfs-stage32/data/etc | |
| parent | Merge branch 'master' of simonslx:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-b77ffba65617c4001e85a31dc9673d0abe481fb8.tar.gz tm-scripts-b77ffba65617c4001e85a31dc9673d0abe481fb8.tar.xz tm-scripts-b77ffba65617c4001e85a31dc9673d0abe481fb8.zip | |
<stage32> Trigger network target as soon as possible if network/dhcp has been done in stage31
Diffstat (limited to 'remote/rootfs/rootfs-stage32/data/etc')
5 files changed, 6 insertions, 3 deletions
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/early-network-triggers.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/early-network-triggers.service index 7ed6e2a6..4713dae1 100644 --- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/early-network-triggers.service +++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/early-network-triggers.service @@ -3,7 +3,9 @@ [Unit] Description=Trigger network targets early DefaultDependencies=no +Wants=systemd-tmpfiles-setup.service Before=sysinit.target +After=systemd-tmpfiles-setup.service [Service] Type=oneshot diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-dns.target b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-dns.target index c0b7793b..bc12cd1b 100644 --- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-dns.target +++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-dns.target @@ -1,4 +1,4 @@ [Unit] - Description=DNS Server available +ConditionPathExists=/run/network/dns-ready diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-gateway.target b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-gateway.target index cfeb719c..770eb697 100644 --- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-gateway.target +++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-gateway.target @@ -1,3 +1,4 @@ [Unit] - Description=Default route configured +ConditionPathExists=/run/network/gateway-ready + diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/ntpdate.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/ntpdate.service index a48375d0..ebaa9afb 100644 --- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/ntpdate.service +++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/ntpdate.service @@ -2,7 +2,6 @@ Description=Update date from local time server After=network.target Requires=network.target -ConditionPathExists=/run/udhcpc/network-ready [Service] Type=oneshot diff --git a/remote/rootfs/rootfs-stage32/data/etc/tmpfiles.d/network.conf b/remote/rootfs/rootfs-stage32/data/etc/tmpfiles.d/network.conf new file mode 100644 index 00000000..dd67e785 --- /dev/null +++ b/remote/rootfs/rootfs-stage32/data/etc/tmpfiles.d/network.conf @@ -0,0 +1 @@ +D /run/network 0755 root root |