From b6ae350825bf57148a460524bf7f40b834ae3b11 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sun, 5 Jan 2025 16:23:20 +0900 Subject: [PATCH 1/2] Add network configs --- meson.build | 3 +++ network/01-network-manager-all.yml | 4 ++++ network/10-globally-managed-devices.conf | 0 network/meson.build | 11 +++++++++++ 4 files changed, 18 insertions(+) create mode 100644 network/01-network-manager-all.yml create mode 100644 network/10-globally-managed-devices.conf create mode 100644 network/meson.build diff --git a/meson.build b/meson.build index c777f89..c45d2da 100644 --- a/meson.build +++ b/meson.build @@ -49,3 +49,6 @@ subdir('skel') # GTK settings subdir('gtk') + +# Network settings +subdir('network') diff --git a/network/01-network-manager-all.yml b/network/01-network-manager-all.yml new file mode 100644 index 0000000..4a8fd08 --- /dev/null +++ b/network/01-network-manager-all.yml @@ -0,0 +1,4 @@ +# Let NetworkManager manage all devices on this system +network: + version: 2 + renderer: NetworkManager diff --git a/network/10-globally-managed-devices.conf b/network/10-globally-managed-devices.conf new file mode 100644 index 0000000..e69de29 diff --git a/network/meson.build b/network/meson.build new file mode 100644 index 0000000..4271ab9 --- /dev/null +++ b/network/meson.build @@ -0,0 +1,11 @@ +install_data( + '01-network-manager-all.yml', + install_dir: sysconfdir / 'netplan' +) + +# Override /usr/lib/NetworkManager/conf.d/10-globally-managed-devices.conf shipped by NetworkManager +# See https://askubuntu.com/a/1075112 +install_data( + '10-globally-managed-devices.conf', + install_dir: sysconfdir / 'NetworkManager' / 'conf.d' +) From d7c4be1d39afd5fbbdd10156b95966beadf34da7 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sun, 5 Jan 2025 17:08:48 +0900 Subject: [PATCH 2/2] Fix missing install --- debian/install | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/install b/debian/install index f28bf94..2dac992 100644 --- a/debian/install +++ b/debian/install @@ -10,3 +10,5 @@ skel/.inputrc /etc/skel/ usr/share/accountsservice/interfaces/ usr/share/glib-2.0/schemas usr/share/xdg-desktop-portal +network/01-network-manager-all.yml /etc/netplan/ +network/10-globally-managed-devices.conf /etc/NetworkManager/conf.d/