From ccf576ab6d4cb957d6532797b5fbdfca4bb4269b Mon Sep 17 00:00:00 2001
From: JUN JIE NAN <nanjunjie@gmail.com>
Date: Mon, 24 Jun 2024 09:26:35 +0800
Subject: [PATCH] Keep ubuntu network settings consistent

Related with PR lxc/distrobuilder#859.

Signed-off-by: JUN JIE NAN <nanjunjie@gmail.com>
---
 images/ubuntu.yaml | 49 ++--------------------------------------------
 1 file changed, 2 insertions(+), 47 deletions(-)

diff --git a/images/ubuntu.yaml b/images/ubuntu.yaml
index 1a389f0b..60f3b087 100644
--- a/images/ubuntu.yaml
+++ b/images/ubuntu.yaml
@@ -346,10 +346,9 @@ files:
   - lunar
   - mantic
   - noble
-  types:
-  - container
   variants:
   - default
+  - desktop
 
 - path: /etc/network/interfaces
   generator: dump
@@ -367,50 +366,6 @@ files:
     source /etc/network/interfaces.d/*.cfg
   releases:
   - xenial
-  types:
-  - container
-
-- path: /etc/netplan/10-lxc.yaml
-  generator: dump
-  mode: 0600
-  content: |-
-    network:
-      version: 2
-      ethernets:
-        enp5s0:
-          dhcp4: true
-          dhcp-identifier: mac
-  releases:
-  - bionic
-  - focal
-  - jammy
-  - lunar
-  - mantic
-  - noble
-  types:
-  - vm
-  variants:
-  - default
-  - desktop
-
-- path: /etc/network/interfaces
-  generator: dump
-  content: |-
-    # This file describes the network interfaces available on your system
-    # and how to activate them. For more information, see interfaces(5).
-
-    # The loopback network interface
-    auto lo
-    iface lo inet loopback
-
-    auto enp5s0
-    iface enp5s0 inet dhcp
-
-    source /etc/network/interfaces.d/*.cfg
-  releases:
-  - xenial
-  types:
-  - vm
 
 - name: meta-data
   generator: cloud-init
@@ -447,7 +402,7 @@ files:
   content: |-
     GRUB_RECORDFAIL_TIMEOUT=0
     GRUB_TIMEOUT=0
-    GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_DEFAULT} console=tty1 console=ttyS0"
+    GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_DEFAULT} net.ifnames=0 console=tty1 console=ttyS0"
     GRUB_TERMINAL=console
   types:
   - vm