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.

diff --git a/meson_options.txt b/meson_options.txt
index c31e3cd4d719a8c7bc72e72c2709a141c7005afe..83b1f812141456ad7da64bd98ad3bacbc91a0dc5 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -130,6 +130,8 @@ option('homed', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : '
        description : 'install the systemd-homed stack')
 option('networkd', type : 'boolean',
        description : 'install the systemd-networkd stack')
+option('default-network', type : 'boolean', value : true,
+       description : 'install default .network files')
 option('timedated', type : 'boolean',
        description : 'install the systemd-timedated daemon')
 option('timesyncd', type : 'boolean',

diff --git a/network/80-ethernet.network.example b/network/89-ethernet.network.example
similarity index 100%
rename from network/80-ethernet.network.example
rename to network/89-ethernet.network.example

diff --git a/network/meson.build b/network/meson.build
index e44779ad2618dc5b9cce9d0371f5035bdb7466cc..b9564b766f5b0b91ef1ecda931c5dd353ec94c3d 100644 (file)
--- 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')