diff --git a/debian/changelog b/debian/changelog index a75d0f2b..56ad9ed1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Thu, 14 Apr 2016 14:47:42 -0400 + livecd-rootfs (2.400) xenial; urgency=medium * Transition from ubuntu-snappy to ubuntu-core-snapd-units and snapd. diff --git a/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary b/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary index a4e0b745..d085ba38 100755 --- a/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary +++ b/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary @@ -41,7 +41,7 @@ GRUB_RECORDFAIL_TIMEOUT=0 GRUB_TIMEOUT=0 # Set the default commandline -GRUB_CMDLINE_LINUX_DEFAULT="console=hvc0 earlyprintk net.ifnames=0" +GRUB_CMDLINE_LINUX_DEFAULT="console=hvc0 earlyprintk" EOF prep_partition="/dev/mapper${loop_device///dev/}p2" chroot mountpoint grub-install "${prep_partition}" \ diff --git a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot index 6adfdf98..cf6b6bdb 100755 --- a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot +++ b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot @@ -263,7 +263,7 @@ GRUB_RECORDFAIL_TIMEOUT=0 GRUB_TIMEOUT=0 # 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 GRUB_TERMINAL=console diff --git a/live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces b/live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces index a3e1bad7..bb161e72 100644 --- a/live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces +++ b/live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces @@ -8,8 +8,5 @@ iface lo inet loopback # Source interfaces # Please check /etc/network/interfaces.d before changing this file # 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 source /etc/network/interfaces.d/*.cfg - diff --git a/live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces.d/eth0.cfg b/live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces.d/eth0.cfg deleted file mode 100644 index d117f4b2..00000000 --- a/live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces.d/eth0.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# The primary network interface -auto eth0 -iface eth0 inet dhcp