Merge pull request #29930 from yuwata/meson-default-network-fix-install-path

meson: fix install path of example .network files
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2023-11-14 17:33:42 +01:00
committed by GitHub
4 changed files with 43 additions and 37 deletions
+2 -2
View File
@@ -341,12 +341,12 @@ testcase_timesyncd() {
# Create a dummy interface managed by networkd, so we can configure link NTP servers
mkdir -p /run/systemd/network/
cat >/etc/systemd/network/ntp99.netdev <<EOF
cat >/etc/systemd/network/10-ntp99.netdev <<EOF
[NetDev]
Name=ntp99
Kind=dummy
EOF
cat >/etc/systemd/network/ntp99.network <<EOF
cat >/etc/systemd/network/10-ntp99.network <<EOF
[Match]
Name=ntp99
+5 -5
View File
@@ -19,9 +19,9 @@ at_exit() {
trap at_exit EXIT
export NETWORK_NAME="networkctl-test-$RANDOM.network"
export NETDEV_NAME="networkctl-test-$RANDOM.netdev"
export LINK_NAME="90-networkctl-test-$RANDOM.link"
export NETWORK_NAME="10-networkctl-test-$RANDOM.network"
export NETDEV_NAME="10-networkctl-test-$RANDOM.netdev"
export LINK_NAME="10-networkctl-test-$RANDOM.link"
cat >"/usr/lib/systemd/network/$NETWORK_NAME" <<EOF
[Match]
Name=test
@@ -40,7 +40,7 @@ printf '%s\n' '[Match]' 'Name=test2' | cmp - "/etc/systemd/network/$NETWORK_NAME
cat >"+4" <<EOF
[Network]
DHCP=yes
IPv6AcceptRA=no
EOF
EDITOR='cp' script -ec 'networkctl edit "$NETWORK_NAME" --drop-in test' /dev/null
@@ -74,7 +74,7 @@ systemctl stop systemd-networkd
(! networkctl cat @test2)
systemctl start systemd-networkd
sleep 1
SYSTEMD_LOG_LEVEL=debug /usr/lib/systemd/systemd-networkd-wait-online -i test2:carrier --timeout 20
networkctl cat @test2:network | cmp - <(networkctl cat "$NETWORK_NAME")
EDITOR='cp' script -ec 'networkctl edit @test2 --drop-in test2.conf' /dev/null
+2 -2
View File
@@ -168,12 +168,12 @@ fd00:dead:beef:cafe::1 ns1.unsigned.test
EOF
mkdir -p /etc/systemd/network
cat >/etc/systemd/network/dns0.netdev <<EOF
cat >/etc/systemd/network/10-dns0.netdev <<EOF
[NetDev]
Name=dns0
Kind=dummy
EOF
cat >/etc/systemd/network/dns0.network <<EOF
cat >/etc/systemd/network/10-dns0.network <<EOF
[Match]
Name=dns0