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

Merge pull request #2209 from lubuntu-team/lubuntu/netplan-configs

Browse Source 
Quick vendor patch to add support for Netplan-based configs
This commit is contained in:
Adriaan de Groot 2023-10-09 22:31:34 +02:00 committed by GitHub
commit cf9f283a8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@
# #
import os import os
import glob
import shutil import shutil
import libcalamares import libcalamares
@ -131,6 +132,21 @@ def run():
except FileExistsError: except FileExistsError:
pass pass
# Also install netplan files
source_netplan = "/etc/netplan"
root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
target_netplan = os.path.join(root_mount_point, source_netplan.lstrip('/'))
if os.path.exists(source_netplan) and os.path.exists(target_netplan):
for cfg in glob.glob(os.path.join(source_netplan, "90-NM-*")):
source_cfg = os.path.join(source_netplan, cfg)
target_cfg = os.path.join(target_netplan, os.path.basename(cfg))
if os.path.exists(target_cfg):
continue
shutil.copy(source_cfg, target_cfg)
# We need to overwrite the default resolv.conf in the chroot. # We need to overwrite the default resolv.conf in the chroot.
source_resolv, target_resolv = path_pair(root_mount_point, "etc/resolv.conf") source_resolv, target_resolv = path_pair(root_mount_point, "etc/resolv.conf")
if source_resolv != target_resolv and os.path.exists(source_resolv): if source_resolv != target_resolv and os.path.exists(source_resolv):