From e8d456fba8423a3f840fa488f531c4b4e46b5624 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 30 Jul 2019 00:50:19 +0900 Subject: network-generator: rename generated unit files The tool may be used in the initrd-less systems. --- .../test-01-dhcp.expected/91-default.network | 11 +++++++++++ .../test-01-dhcp.expected/99-initrd-default.network | 11 ----------- .../test-02-bridge.expected/90-bridge99.netdev | 5 +++++ .../test-02-bridge.expected/90-bridge99.network | 13 +++++++++++++ .../test-02-bridge.expected/90-eth0.network | 21 +++++++++++++++++++++ .../test-02-bridge.expected/90-eth1.network | 21 +++++++++++++++++++++ .../98-initrd-bridge99.netdev | 5 ----- .../98-initrd-bridge99.network | 13 ------------- .../test-02-bridge.expected/98-initrd-eth0.network | 21 --------------------- .../test-02-bridge.expected/98-initrd-eth1.network | 21 --------------------- 10 files changed, 71 insertions(+), 71 deletions(-) create mode 100644 test/TEST-35-NETWORK-GENERATOR/test-01-dhcp.expected/91-default.network delete mode 100644 test/TEST-35-NETWORK-GENERATOR/test-01-dhcp.expected/99-initrd-default.network create mode 100644 test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-bridge99.netdev create mode 100644 test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-bridge99.network create mode 100644 test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-eth0.network create mode 100644 test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-eth1.network delete mode 100644 test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-bridge99.netdev delete mode 100644 test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-bridge99.network delete mode 100644 test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-eth0.network delete mode 100644 test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-eth1.network (limited to 'test') diff --git a/test/TEST-35-NETWORK-GENERATOR/test-01-dhcp.expected/91-default.network b/test/TEST-35-NETWORK-GENERATOR/test-01-dhcp.expected/91-default.network new file mode 100644 index 0000000000..e42ce1e311 --- /dev/null +++ b/test/TEST-35-NETWORK-GENERATOR/test-01-dhcp.expected/91-default.network @@ -0,0 +1,11 @@ +# Automatically generated by systemd-network-generator + +[Match] +Name=* + +[Link] + +[Network] +DHCP=ipv4 + +[DHCP] diff --git a/test/TEST-35-NETWORK-GENERATOR/test-01-dhcp.expected/99-initrd-default.network b/test/TEST-35-NETWORK-GENERATOR/test-01-dhcp.expected/99-initrd-default.network deleted file mode 100644 index e42ce1e311..0000000000 --- a/test/TEST-35-NETWORK-GENERATOR/test-01-dhcp.expected/99-initrd-default.network +++ /dev/null @@ -1,11 +0,0 @@ -# Automatically generated by systemd-network-generator - -[Match] -Name=* - -[Link] - -[Network] -DHCP=ipv4 - -[DHCP] diff --git a/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-bridge99.netdev b/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-bridge99.netdev new file mode 100644 index 0000000000..97c22485b7 --- /dev/null +++ b/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-bridge99.netdev @@ -0,0 +1,5 @@ +# Automatically generated by systemd-network-generator + +[NetDev] +Kind=bridge +Name=bridge99 diff --git a/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-bridge99.network b/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-bridge99.network new file mode 100644 index 0000000000..f8d19baaea --- /dev/null +++ b/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-bridge99.network @@ -0,0 +1,13 @@ +# Automatically generated by systemd-network-generator + +[Match] +Name=bridge99 + +[Link] +MACAddress=00:11:22:33:44:55 +MTUBytes=1530 + +[Network] +DHCP=ipv4 + +[DHCP] diff --git a/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-eth0.network b/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-eth0.network new file mode 100644 index 0000000000..8842b57921 --- /dev/null +++ b/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-eth0.network @@ -0,0 +1,21 @@ +# Automatically generated by systemd-network-generator + +[Match] +Name=eth0 + +[Link] + +[Network] +DHCP=no +DNS=10.10.10.10 +DNS=10.10.10.11 +Bridge=bridge99 + +[DHCP] +Hostname=hogehoge + +[Address] +Address=192.168.0.10/24 + +[Route] +Gateway=192.168.0.1 diff --git a/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-eth1.network b/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-eth1.network new file mode 100644 index 0000000000..feff4f5ba8 --- /dev/null +++ b/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-eth1.network @@ -0,0 +1,21 @@ +# Automatically generated by systemd-network-generator + +[Match] +Name=eth1 + +[Link] + +[Network] +DHCP=no +DNS=10.10.10.10 +DNS=10.10.10.11 +Bridge=bridge99 + +[DHCP] +Hostname=hogehoge + +[Address] +Address=192.168.0.11/24 + +[Route] +Gateway=192.168.0.1 diff --git a/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-bridge99.netdev b/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-bridge99.netdev deleted file mode 100644 index 97c22485b7..0000000000 --- a/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-bridge99.netdev +++ /dev/null @@ -1,5 +0,0 @@ -# Automatically generated by systemd-network-generator - -[NetDev] -Kind=bridge -Name=bridge99 diff --git a/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-bridge99.network b/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-bridge99.network deleted file mode 100644 index f8d19baaea..0000000000 --- a/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-bridge99.network +++ /dev/null @@ -1,13 +0,0 @@ -# Automatically generated by systemd-network-generator - -[Match] -Name=bridge99 - -[Link] -MACAddress=00:11:22:33:44:55 -MTUBytes=1530 - -[Network] -DHCP=ipv4 - -[DHCP] diff --git a/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-eth0.network b/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-eth0.network deleted file mode 100644 index 8842b57921..0000000000 --- a/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-eth0.network +++ /dev/null @@ -1,21 +0,0 @@ -# Automatically generated by systemd-network-generator - -[Match] -Name=eth0 - -[Link] - -[Network] -DHCP=no -DNS=10.10.10.10 -DNS=10.10.10.11 -Bridge=bridge99 - -[DHCP] -Hostname=hogehoge - -[Address] -Address=192.168.0.10/24 - -[Route] -Gateway=192.168.0.1 diff --git a/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-eth1.network b/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-eth1.network deleted file mode 100644 index feff4f5ba8..0000000000 --- a/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-eth1.network +++ /dev/null @@ -1,21 +0,0 @@ -# Automatically generated by systemd-network-generator - -[Match] -Name=eth1 - -[Link] - -[Network] -DHCP=no -DNS=10.10.10.10 -DNS=10.10.10.11 -Bridge=bridge99 - -[DHCP] -Hostname=hogehoge - -[Address] -Address=192.168.0.11/24 - -[Route] -Gateway=192.168.0.1 -- cgit v1.2.1