Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Import network configurations from the os repository #325

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Import network configurations from the os repository #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6ae350
Add network configs
ryonakano Jan 5, 2025
d7c4be1
Fix missing install
ryonakano Jan 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions debian/install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
3 changes: 3 additions & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,6 @@ subdir('skel')

# GTK settings
subdir('gtk')

# Network settings
subdir('network')
4 changes: 4 additions & 0 deletions network/01-network-manager-all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Let NetworkManager manage all devices on this system
network:
version: 2
renderer: NetworkManager
Empty file added network/10-globally-managed-devices.conf
View file
Open in desktop
Empty file.
11 changes: 11 additions & 0 deletions network/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess if it's the same file name the package will conflict right? So it would need to be a number with a higher priority?

install_dir: sysconfdir / 'NetworkManager' / 'conf.d'
)
Loading