From 9b7a624267fddc5c20bd15480e7a393d7a3b270e Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 2 Nov 2023 14:12:42 +0900
Subject: network: add meson option to rename .example files on install

Also this renames 80-ethernet.network.example -> 89-ethernet.network.example,
to make it have lower precedence over other default .network files for
Ethernet interfaces.

Closes #29765.
---
 network/80-ethernet.network.example | 17 -----------------
 network/89-ethernet.network.example | 17 +++++++++++++++++
 network/meson.build                 | 22 +++++++++++++++++++---
 3 files changed, 36 insertions(+), 20 deletions(-)
 delete mode 100644 network/80-ethernet.network.example
 create mode 100644 network/89-ethernet.network.example

(limited to 'network')

diff --git a/network/80-ethernet.network.example b/network/80-ethernet.network.example
deleted file mode 100644
index ce82b25728..0000000000
--- a/network/80-ethernet.network.example
+++ /dev/null
@@ -1,17 +0,0 @@
-# SPDX-License-Identifier: MIT-0
-#
-# This example config file is installed as part of systemd.
-# It may be freely copied and edited (following the MIT No Attribution license).
-#
-# To use the file, one of the following methods may be used:
-# 1. add a symlink from /etc/systemd/network to the current location of this file,
-# 2. copy the file into /etc/systemd/network or one of the other paths checked
-#    by systemd-networkd and edit it there.
-# This file should not be edited in place, because it'll be overwritten on upgrades.
-
-# Enable DHCPv4 and DHCPv6 on all ethernet links
-[Match]
-Type=ether
-
-[Network]
-DHCP=yes
diff --git a/network/89-ethernet.network.example b/network/89-ethernet.network.example
new file mode 100644
index 0000000000..ce82b25728
--- /dev/null
+++ b/network/89-ethernet.network.example
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: MIT-0
+#
+# This example config file is installed as part of systemd.
+# It may be freely copied and edited (following the MIT No Attribution license).
+#
+# To use the file, one of the following methods may be used:
+# 1. add a symlink from /etc/systemd/network to the current location of this file,
+# 2. copy the file into /etc/systemd/network or one of the other paths checked
+#    by systemd-networkd and edit it there.
+# This file should not be edited in place, because it'll be overwritten on upgrades.
+
+# Enable DHCPv4 and DHCPv6 on all ethernet links
+[Match]
+Type=ether
+
+[Network]
+DHCP=yes
diff --git a/network/meson.build b/network/meson.build
index e44779ad26..b9564b766f 100644
--- a/network/meson.build
+++ b/network/meson.build
@@ -3,17 +3,33 @@
 if conf.get('ENABLE_NETWORKD') == 1
         install_data(
                 '80-6rd-tunnel.network',
-                '80-auto-link-local.network.example',
                 '80-container-host0.network',
                 '80-container-vb.network',
                 '80-container-ve.network',
                 '80-container-vz.network',
-                '80-ethernet.network.example',
                 '80-vm-vt.network',
                 '80-wifi-adhoc.network',
+                install_dir : networkdir)
+
+        example_network_files = files(
+                '80-auto-link-local.network.example',
+                '89-ethernet.network.example',
                 '80-wifi-ap.network.example',
                 '80-wifi-station.network.example',
-                install_dir : networkdir)
+        )
+
+        if get_option('default-network')
+                foreach f : example_network_files
+                        install_data(
+                                f,
+                                rename : fs.replace_suffix(f, ''),
+                                install_dir : networkdir)
+                endforeach
+        else
+                install_data(
+                        example_network_files,
+                        install_dir : networkdir)
+        endif
 
         if install_sysconfdir
                 install_emptydir(sysconfdir / 'systemd/network')
-- 
cgit v1.2.3