From 35dbb8b0d69099f6cdf3ea8ce5f4c2817daf010f Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 8 Nov 2023 21:48:28 +0900 Subject: [PATCH 1/2] meson: disable -Ddefault-network by default Follow-up for 9b7a624267fddc5c20bd15480e7a393d7a3b270e. This may break existing setups. Let's disable it by default. --- meson_options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt index e9283dc37e..83b48ff5bb 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -130,7 +130,7 @@ 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, +option('default-network', type : 'boolean', value : false, description : 'install default .network files') option('timedated', type : 'boolean', description : 'install the systemd-timedated daemon') From e941da8425597985d257caaa6593c6ec72402a0d Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 8 Nov 2023 21:52:38 +0900 Subject: [PATCH 2/2] meson: fix install path of example .network files It seems that when 'rename' field is set, the path (instead of the filename) is appended to the 'install_dir'. Follow-up for 9b7a624267fddc5c20bd15480e7a393d7a3b270e. Fixes #29925. --- network/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network/meson.build b/network/meson.build index b343bf6ad3..4f17f7385e 100644 --- a/network/meson.build +++ b/network/meson.build @@ -22,7 +22,7 @@ if conf.get('ENABLE_NETWORKD') == 1 foreach f : example_network_files install_data( f, - rename : fs.replace_suffix(f, ''), + rename : fs.replace_suffix(fs.name(f), ''), install_dir : networkdir) endforeach else