From cd88f79771f81cabc35f6338d904d7520be5abe2 Mon Sep 17 00:00:00 2001 From: Petr Ruzicka Date: Mon, 6 Apr 2020 06:50:34 +0200 Subject: [PATCH] Move netplan cleanup to sysprep-op-network.sh --- scripts/ubuntu/disable-netplan-networkd.sh | 12 ------------ ubuntu-desktop.json | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 scripts/ubuntu/disable-netplan-networkd.sh diff --git a/scripts/ubuntu/disable-netplan-networkd.sh b/scripts/ubuntu/disable-netplan-networkd.sh deleted file mode 100644 index 666fab1d..00000000 --- a/scripts/ubuntu/disable-netplan-networkd.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -eux - -# This needs to be executed on the Ubuntu server installation (mini.iso) when installing Desktop environment using -# `tasksel tasksel/first multiselect ubuntu-desktop` - -# By default Ubuntu server installation (mini.iso) creates the `/etc/netplan/01-netcfg.yaml` and `/etc/netplan/01-network-manager-all.yaml` which causes problems to Vagrant. -# Some details can be found here: https://github.com/hashicorp/vagrant/issues/11378 -# In short the /etc/netplan/01-netcfg.yaml should not be on the Ubuntu Desktop installation when using Vagrant otherwise `vagrant up` is hanging. - -if [[ -s /etc/netplan/01-netcfg.yaml ]] ; then - rm /etc/netplan/01-netcfg.yaml -fi diff --git a/ubuntu-desktop.json b/ubuntu-desktop.json index 3130cea8..06bf2382 100644 --- a/ubuntu-desktop.json +++ b/ubuntu-desktop.json @@ -111,10 +111,10 @@ "scripts/ubuntu/disable_apt-daily.sh", "scripts/ubuntu/spice-vdagent.sh", "scripts/ubuntu/virtualbox-guest-x11.sh", - "scripts/ubuntu/disable-netplan-networkd.sh", "scripts/linux-common/packer-virt-sysprep/sysprep-op-dhcp-client-state.sh", "scripts/linux-common/packer-virt-sysprep/sysprep-op-logfiles.sh", "scripts/linux-common/packer-virt-sysprep/sysprep-op-machine-id.sh", + "scripts/linux-common/packer-virt-sysprep/sysprep-op-network.sh", "scripts/linux-common/packer-virt-sysprep/sysprep-op-package-manager-cache.sh", "scripts/linux-common/packer-virt-sysprep/sysprep-op-ssh-hostkeys.sh", "scripts/linux-common/packer-virt-sysprep/sysprep-op-tmp-files.sh",