|
|
@ -59,11 +59,12 @@ def run():
|
|
|
|
if source_resolv != target_resolv and os.path.exists(source_resolv):
|
|
|
|
if source_resolv != target_resolv and os.path.exists(source_resolv):
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
os.remove(target_resolv)
|
|
|
|
os.remove(target_resolv)
|
|
|
|
except FileNotFoundError:
|
|
|
|
except Error as err:
|
|
|
|
libcalamares.utils.debug("Couldn't remove {}".format(target_resolv))
|
|
|
|
libcalamares.utils.debug("Couldn't remove {}: {}".format(target_resolv, err))
|
|
|
|
|
|
|
|
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
shutil.copy(source_resolv, target_resolv)
|
|
|
|
shutil.copy(source_resolv, target_resolv)
|
|
|
|
except FileNotFoundError:
|
|
|
|
except Error as err:
|
|
|
|
libcalamares.utils.debug("Can't copy resolv.conf from {}".format(source_resolv))
|
|
|
|
libcalamares.utils.debug("Can't copy resolv.conf from {}: {}".format(source_resolv, err))
|
|
|
|
|
|
|
|
|
|
|
|
return None
|
|
|
|
return None
|
|
|
|