diff --git a/1.Base/4.cockpit/0_setup.py b/1.Base/4.cockpit/0_setup.py index 488e3b28ca41a18219309fcf9d51127bbe884fce..1eca2311155ae6db63c5c67ea2a9c0b2add73bb0 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)