diff options
| -rw-r--r-- | meson_options.txt | 2 | ||||
| -rw-r--r-- | network/89-ethernet.network.example (renamed from network/80-ethernet.network.example) | 0 | ||||
| -rw-r--r-- | network/meson.build | 22 |
3 files changed, 21 insertions, 3 deletions
diff --git a/meson_options.txt b/meson_options.txt index c31e3cd4d7..83b1f81214 100644 --- 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 index ce82b25728..ce82b25728 100644 --- a/network/80-ethernet.network.example +++ b/network/89-ethernet.network.example 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') |