applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 10:55:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[networkcfg] Refactor getting source-and-target paths of a file

Browse source
This commit is contained in:
Adriaan de Groot 2021-09-24 12:33:00 +02:00
parent 13d69cb813
commit ce5d42ce0f
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/modules/networkcfg/main.py
View file

@ -85,6 +85,13 @@ def replace_username(nm_config_filename, live_user, target_user):
network_conf.write(line)
def path_pair(root_mount_point, relative_path):
"""
Returns /relative_path and the relative path in the target system.
"""
return ("/" + relative_path, os.path.join(root_mount_point, relative_path))
def run():
"""
Setup network configuration
@ -98,9 +105,7 @@ def run():
return (_("Configuration Error"),
_("No root mount point is given for <pre>{!s}</pre> to use." ).format("networkcfg"))
nm_connections = "etc/NetworkManager/system-connections/"
source_nm = "/" + nm_connections
target_nm = os.path.join(root_mount_point, nm_connections)
source_nm, target_nm = path_pair(root_mount_point, "etc/NetworkManager/system-connections/")
# Sanity checks. We don't want to do anything if a network
# configuration already exists on the target
@ -127,8 +132,7 @@ def run():
pass
# We need to overwrite the default resolv.conf in the chroot.
source_resolv = "/etc/resolv.conf"
target_resolv = os.path.join(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):
try:
os.remove(target_resolv)