From 254319f6642c5903eafe330ba18d8677e0643dbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florent=20Thi=C3=A9ry?= <florent.thiery@ubicast.eu>
Date: Wed, 30 Jan 2019 12:01:09 +0100
Subject: [PATCH] only remove systemd-resolve resolv.conf is still present
---
1.Base/4.cockpit/0_setup.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/1.Base/4.cockpit/0_setup.py b/1.Base/4.cockpit/0_setup.py
index 488e3b28..1eca2311 100644
--- a/1.Base/4.cockpit/0_setup.py
+++ b/1.Base/4.cockpit/0_setup.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python3
import utils
+import os
def setup(interactive=False):
@@ -11,8 +12,12 @@ def setup(interactive=False):
'apt purge --auto-remove -y netplan.io',
'mkdir -p /etc/NetworkManager/conf.d',
'touch /etc/NetworkManager/conf.d/10-globally-managed-devices.conf',
- 'ls /run/systemd/resolve/resolv.conf && rm /etc/resolv.conf && cp /run/systemd/resolve/resolv.conf /etc/resolv.conf',
+ ]
+ if os.path.exists('/run/systemd/resolve/resolv.conf'):
+ cmds.append('rm /etc/resolv.conf && cp /run/systemd/resolve/resolv.conf /etc/resolv.conf')
+
+ cmds.extend([
'systemctl disable --now systemd-resolved.service',
'printf "[main]\ndns=default" > /etc/NetworkManager/conf.d/disable-systemd-resolved.conf',
- ]
+ ])
utils.run_commands(cmds)
--
GitLab