| commit | 64a012ba66ad205783e5d7853b3e6379628c8220 | [log] [tgz] |
|---|---|---|
| author | Tomáš Pecka <tomas.pecka@cesnet.cz> | Mon Feb 22 16:07:55 2021 +0100 |
| committer | Tomáš Pecka <tomas.pecka@cesnet.cz> | Mon Feb 22 16:10:04 2021 +0100 |
| tree | 64d7d5914131e1d169e844c6d9b56d4084f1059c | |
| parent | 1be1ee279b8162a7f7fe7c0869536ba51e4e3b60 [diff] |
velia: update and always copy the network file For the latest changes in velia (see #3889) it is required that the .network file in /run always exist. Depends-on: https://cesnet-gerrit-czechlight/c/CzechLight/velia/+/3889 Depends-on: https://cesnet-gerrit-public/c/CzechLight/velia/+/3889 Depends-on: https://gerrit.cesnet.cz/c/CzechLight/velia/+/3889 Change-Id: I3f97104b77e9e98973ea1ccaad0a8f51d1fdfb17
diff --git a/package/czechlight-cfg-fs/cfg-restore-systemd-networkd.service b/package/czechlight-cfg-fs/cfg-restore-systemd-networkd.service index c8ca250..4be3ad6 100644 --- a/package/czechlight-cfg-fs/cfg-restore-systemd-networkd.service +++ b/package/czechlight-cfg-fs/cfg-restore-systemd-networkd.service
@@ -8,7 +8,7 @@ Type=oneshot RemainAfterExit=yes ExecStartPre=/usr/bin/mkdir -p /run/systemd/network -ExecStart=/bin/sh -c "[[ -f /cfg/network/eth1.network ]] && cp /cfg/network/eth1.network /run/systemd/network/ || true" +ExecStart=/bin/sh -c "[[ -f /cfg/network/eth1.network ]] && cp /cfg/network/eth1.network /run/systemd/network/ || cp /usr/lib/systemd/network/eth1.network /run/systemd/network/" [Install] WantedBy=network-pre.target
diff --git a/submodules/velia b/submodules/velia index 13e9f24..1e7c4c3 160000 --- a/submodules/velia +++ b/submodules/velia
@@ -1 +1 @@ -Subproject commit 13e9f2429b6755b8377e742871b5eac3ceca9bc9 +Subproject commit 1e7c4c3c6cf17abcc6504f2be2f53c39112909d4