From 9cc1a68ad19aeacd7cf9db62abc93d7d1771d41f Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Thu, 9 Jul 2015 16:41:53 +0200 Subject: [PATCH] Import patches-unapplied version 2.331 to ubuntu/wily-proposed Imported using git-ubuntu import. Changelog parent: 2840dc63ee3069e833ee370b19dc4ae3080aadc8 New changelog entries: * merge lp:~sergiusens/livecd-rootfs/eth0Not to not hardcode eth0 anymore on snappy. --- debian/changelog | 7 +++++++ live-build/ubuntu-core/hooks/04-configure_network.chroot | 9 --------- 2 files changed, 7 insertions(+), 9 deletions(-) delete mode 100755 live-build/ubuntu-core/hooks/04-configure_network.chroot diff --git a/debian/changelog b/debian/changelog index b97f4864..45605c36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.331) wily; urgency=medium + + * merge lp:~sergiusens/livecd-rootfs/eth0Not to not hardcode eth0 anymore on + snappy. + + -- Oliver Grawert Thu, 09 Jul 2015 16:41:53 +0200 + livecd-rootfs (2.330) wily; urgency=medium * fix another quoting issue in snappy diff --git a/live-build/ubuntu-core/hooks/04-configure_network.chroot b/live-build/ubuntu-core/hooks/04-configure_network.chroot deleted file mode 100755 index d96d9aa8..00000000 --- a/live-build/ubuntu-core/hooks/04-configure_network.chroot +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -x - -if=eth0 - -# Manually configure the first ethernet device -cat >/etc/network/interfaces.d/"$if"<