napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2284 from slyon/netplan

Browse Source 
[RFC] networkcfg: Configure NetworkManager to be the default Netplan renderer
This commit is contained in:
Adriaan de Groot 2024-02-13 20:11:10 +01:00 committed by GitHub
commit 4f43e8d303
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/modules/networkcfg/main.py
View File

@ -138,7 +138,27 @@ def run():
target_netplan = os.path.join(root_mount_point, source_netplan.lstrip('/')) target_netplan = os.path.join(root_mount_point, source_netplan.lstrip('/'))
if os.path.exists(source_netplan) and os.path.exists(target_netplan): if os.path.exists(source_netplan) and os.path.exists(target_netplan):
for cfg in glob.glob(os.path.join(source_netplan, "90-NM-*")): # Set NetworkManager to be the default renderer if Netplan is installed
# TODO: We might rather do that inside the network-manager package, see:
# https://bugs.launchpad.net/ubuntu/+source/ubuntu-settings/+bug/2020110
default_renderer = os.path.join(root_mount_point, "usr/lib/netplan",
"00-network-manager-all.yaml")
if not os.path.exists(default_renderer):
renderer_file = os.path.join(target_netplan,
"01-network-manager-all.yaml")
nm_renderer = """# This file was written by calamares.
# Let NetworkManager manage all devices on this system.
# For more information, see netplan(5).
network:
version: 2
renderer: NetworkManager
"""
with open(renderer_file, 'w') as f:
f.writelines(nm_renderer)
os.chmod(f, 0o600)
# Copy existing Netplan configuration
for cfg in glob.glob(os.path.join(source_netplan, "*.yaml")):
source_cfg = os.path.join(source_netplan, cfg) source_cfg = os.path.join(source_netplan, cfg)
target_cfg = os.path.join(target_netplan, os.path.basename(cfg)) target_cfg = os.path.join(target_netplan, os.path.basename(cfg))