From 2c27aab38ccee720512dc9e1334d8b5f82bd447b Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Thu, 14 Apr 2016 11:06:33 -0700 Subject: [PATCH] Re-enable systemd predictable interface naming in cloud images --- live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary | 2 +- live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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