From 6d34c7a9e9c6b3a1b76366b6d9ab97e4e636b2dc Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 14 Jan 2015 22:53:01 -0800 Subject: [PATCH] live-build/ubuntu-core/hooks/04-configure_network.chroot: use 'allow-hotplug' for the network config, not 'auto', to work around systemd behavior that causes 'auto' to delay the rest of the boot when DHCP is not available on the network. --- debian/changelog | 9 +++++++++ live-build/ubuntu-core/hooks/04-configure_network.chroot | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b1f04778..e798bd5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.275+ppa2) vivid; urgency=medium + + * live-build/ubuntu-core/hooks/04-configure_network.chroot: use + 'allow-hotplug' for the network config, not 'auto', to work around + systemd behavior that causes 'auto' to delay the rest of the boot when + DHCP is not available on the network. + + -- Steve Langasek Wed, 14 Jan 2015 22:49:43 -0800 + livecd-rootfs (2.275+ppa1) vivid; urgency=low * live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early: diff --git a/live-build/ubuntu-core/hooks/04-configure_network.chroot b/live-build/ubuntu-core/hooks/04-configure_network.chroot index 745372ad..d96d9aa8 100755 --- a/live-build/ubuntu-core/hooks/04-configure_network.chroot +++ b/live-build/ubuntu-core/hooks/04-configure_network.chroot @@ -4,6 +4,6 @@ if=eth0 # Manually configure the first ethernet device cat >/etc/network/interfaces.d/"$if"<