From 3061756ecb64747bf12af0dc1b0db390717c07a6 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Fri, 1 Apr 2016 16:31:50 +0200 Subject: [PATCH] Import patches-unapplied version 2.395 to ubuntu/xenial-proposed Imported using git-ubuntu import. Changelog parent: 93f2a06b3ca0f82ff93ab32997e4fd0473113745 New changelog entries: * create /etc/cloud/cloud.cfg.d/99-snappy-disable-network-config.cfg on snappy so we do not end up with broken network config after cloud-init ran (LP: #1563296). --- debian/changelog | 8 ++++++++ .../hooks/09-disable-cloud-init-net-breaking.chroot | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100755 live-build/ubuntu-core/hooks/09-disable-cloud-init-net-breaking.chroot diff --git a/debian/changelog b/debian/changelog index 89e62783..9c90d43d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.395) xenial; urgency=medium + + * create /etc/cloud/cloud.cfg.d/99-snappy-disable-network-config.cfg on + snappy so we do not end up with broken network config after cloud-init + ran (LP: #1563296). + + -- Oliver Grawert Fri, 01 Apr 2016 16:31:50 +0200 + livecd-rootfs (2.394) xenial; urgency=medium [ Xavi Garcia ] diff --git a/live-build/ubuntu-core/hooks/09-disable-cloud-init-net-breaking.chroot b/live-build/ubuntu-core/hooks/09-disable-cloud-init-net-breaking.chroot new file mode 100755 index 00000000..d6d77f97 --- /dev/null +++ b/live-build/ubuntu-core/hooks/09-disable-cloud-init-net-breaking.chroot @@ -0,0 +1,8 @@ +#!/bin/sh -x + +[ -d /etc/cloud/cloud.cfg.d ] || mkdir -p /etc/cloud/cloud.cfg.d + +cat >> /etc/cloud/cloud.cfg.d/99-snappy-disable-network-config.cfg <