Skip to content

Commit 94d9ecd

Browse files
authored
Import network configurations from the os repository (#325)
1 parent 65201f8 commit 94d9ecd

4 files changed

Lines changed: 20 additions & 0 deletions

File tree

meson.build

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,6 @@ subdir('geoclue')
5757

5858
# GTK settings
5959
subdir('gtk')
60+
61+
# Network settings
62+
subdir('network')

network/01-network-manager-all.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Let NetworkManager manage all devices on this system
2+
network:
3+
version: 2
4+
renderer: NetworkManager

network/10-globally-managed-devices.conf

Whitespace-only changes.

network/meson.build

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
install_data(
2+
'01-network-manager-all.yml',
3+
install_dir: sysconfdir / 'netplan'
4+
)
5+
6+
# Override /usr/lib/NetworkManager/conf.d/10-globally-managed-devices.conf shipped by NetworkManager
7+
# See https://askubuntu.com/a/1075112
8+
# TODO Remove when upstream fix is merged:
9+
# https://code.launchpad.net/~tintou/network-manager/+git/network-manager/+merge/479821
10+
install_data(
11+
'10-globally-managed-devices.conf',
12+
install_dir: sysconfdir / 'NetworkManager' / 'conf.d'
13+
)

0 commit comments

Comments
 (0)