Import patches-unapplied version 2.401 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 1ab44006f5

New changelog entries:
  * Re-enable systemd predictable network interface naming on cloud-images
  * Stop creating default configuration for eth0 (LP: #1563487)
impish
Daniel Watkins 9 years ago committed by usd-importer
parent 1ab44006f5
commit ccf58fecb7

7
debian/changelog vendored

@ -1,3 +1,10 @@
livecd-rootfs (2.401) xenial; urgency=medium
* Re-enable systemd predictable network interface naming on cloud-images
* Stop creating default configuration for eth0 (LP: #1563487)
-- Daniel Watkins <daniel.watkins@canonical.com> Thu, 14 Apr 2016 14:47:42 -0400
livecd-rootfs (2.400) xenial; urgency=medium livecd-rootfs (2.400) xenial; urgency=medium
* Transition from ubuntu-snappy to ubuntu-core-snapd-units and snapd. * Transition from ubuntu-snappy to ubuntu-core-snapd-units and snapd.

@ -41,7 +41,7 @@ GRUB_RECORDFAIL_TIMEOUT=0
GRUB_TIMEOUT=0 GRUB_TIMEOUT=0
# Set the default commandline # Set the default commandline
GRUB_CMDLINE_LINUX_DEFAULT="console=hvc0 earlyprintk net.ifnames=0" GRUB_CMDLINE_LINUX_DEFAULT="console=hvc0 earlyprintk"
EOF EOF
prep_partition="/dev/mapper${loop_device///dev/}p2" prep_partition="/dev/mapper${loop_device///dev/}p2"
chroot mountpoint grub-install "${prep_partition}" \ chroot mountpoint grub-install "${prep_partition}" \

@ -263,7 +263,7 @@ GRUB_RECORDFAIL_TIMEOUT=0
GRUB_TIMEOUT=0 GRUB_TIMEOUT=0
# Set the default commandline # Set the default commandline
GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0 net.ifnames=0" GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0"
# Set the grub console type # Set the grub console type
GRUB_TERMINAL=console GRUB_TERMINAL=console

@ -8,8 +8,5 @@ iface lo inet loopback
# Source interfaces # Source interfaces
# Please check /etc/network/interfaces.d before changing this file # Please check /etc/network/interfaces.d before changing this file
# as interfaces may have been defined in /etc/network/interfaces.d # as interfaces may have been defined in /etc/network/interfaces.d
# NOTE: the primary ethernet device is defined in
# /etc/network/interfaces.d/eth0
# See LP: #1262951 # See LP: #1262951
source /etc/network/interfaces.d/*.cfg source /etc/network/interfaces.d/*.cfg

@ -1,3 +0,0 @@
# The primary network interface
auto eth0
iface eth0 inet dhcp
Loading…
Cancel
Save