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

Remove target resolv.conf before proceeding.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-09-22 15:43:41 +02:00 committed by Philip
parent ec2094d768
commit 4ed06d4fe3
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,6 +57,10 @@ def run():
source_resolv = "/etc/resolv.conf" source_resolv = "/etc/resolv.conf"
target_resolv = os.path.join(root_mount_point, "etc/resolv.conf") target_resolv = os.path.join(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):
try:
os.remove(target_resolv)
except FileNotFoundError:
libcalamares.utils.debug("Couldn't remove {}".format(target_resolv))
try: try:
shutil.copy(source_resolv, target_resolv) shutil.copy(source_resolv, target_resolv)
except FileNotFoundError: except FileNotFoundError: