Skip to content

Commit

Permalink
Keep ubuntu network settings consistent
Browse files Browse the repository at this point in the history
Related with PR lxc/distrobuilder#859.

Signed-off-by: JUN JIE NAN <nanjunjie@gmail.com>
  • Loading branch information
nanjj committed Jun 24, 2024
1 parent 3861971 commit ccf576a
Showing 1 changed file with 2 additions and 47 deletions.
49 changes: 2 additions & 47 deletions images/ubuntu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -346,10 +346,9 @@ files:
- lunar
- mantic
- noble
types:
- container
variants:
- default
- desktop

- path: /etc/network/interfaces
generator: dump
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit ccf576a

Please sign in to comment.