diff --git a/cmd/d2vm/run/sparsecat-linux-amd64 b/cmd/d2vm/run/sparsecat-linux-amd64 index 90fdeff..bdf2fee 100755 Binary files a/cmd/d2vm/run/sparsecat-linux-amd64 and b/cmd/d2vm/run/sparsecat-linux-amd64 differ diff --git a/templates/debian.Dockerfile b/templates/debian.Dockerfile index ac8366e..7dc25f2 100644 --- a/templates/debian.Dockerfile +++ b/templates/debian.Dockerfile @@ -27,13 +27,14 @@ network:\n\ ethernets:\n\ eth0:\n\ dhcp4: true\n\ + dhcp-identifier: mac\n\ nameservers:\n\ addresses:\n\ - 8.8.8.8\n\ - 8.8.4.4\n\ ' > /etc/netplan/00-netcfg.yaml {{ else if eq .NetworkManager "ifupdown"}} -RUN apt install -y ifupdown2 +RUN if [ -z "$(apt-cache madison ifupdown2 2> /dev/nul)" ]; then apt install -y ifupdown; else apt install -y ifupdown2; fi RUN mkdir -p /etc/network && printf '\ auto eth0\n\ allow-hotplug eth0\n\ diff --git a/templates/ubuntu.Dockerfile b/templates/ubuntu.Dockerfile index ea6d37f..b4c3d93 100644 --- a/templates/ubuntu.Dockerfile +++ b/templates/ubuntu.Dockerfile @@ -26,13 +26,14 @@ network:\n\ ethernets:\n\ eth0:\n\ dhcp4: true\n\ + dhcp-identifier: mac\n\ nameservers:\n\ addresses:\n\ - 8.8.8.8\n\ - 8.8.4.4\n\ ' > /etc/netplan/00-netcfg.yaml {{ else if eq .NetworkManager "ifupdown"}} -RUN apt install -y ifupdown-ng +RUN if [ -z "$(apt-cache madison ifupdown-ng 2> /dev/nul)" ]; then apt install -y ifupdown; else apt install -y ifupdown-ng; fi RUN mkdir -p /etc/network && printf '\ auto eth0\n\ allow-hotplug eth0\n\