From 0d364d49cfeca397d233532bd1052895ef3b2f66 Mon Sep 17 00:00:00 2001 From: Saverio Proto Date: Tue, 21 Jul 2015 10:25:54 +0200 Subject: [PATCH] Debian: dont set always the hostname to debian If we dont force the hostname to be debian, the hostname will be the one choosen when creating the instance with horizon This bug was introduced when the debian element was split into debian and debian-minimal and debootstrap in commit 23aa76df Change-Id: I007a3531f6876890a2e113082211889ec5ead1a1 --- elements/debian/install.d/10-cloud-opinions | 7 ------- 1 file changed, 7 deletions(-) diff --git a/elements/debian/install.d/10-cloud-opinions b/elements/debian/install.d/10-cloud-opinions index 8fd581250..e35352ff4 100755 --- a/elements/debian/install.d/10-cloud-opinions +++ b/elements/debian/install.d/10-cloud-opinions @@ -37,10 +37,3 @@ if [ "$DIB_DEBIAN_ALT_INIT_PACKAGE" != "sysvinit" ]; then /etc/apt/preferences.d/sysvinit > /etc/apt/preferences.d/sysvinit fi -# Since Jessie, when either 'hostname' or 'fqdn' are in a config file, it -# considers them as authoritative and would only use cloud meta data as a -# fallback. -if [ "$DIB_RELEASE" = 'wheezy' ]; then - # specify a hostname so that cloud-init does not default to (None) - echo 'hostname: debian' > /etc/cloud/cloud.cfg.d/01_hostname.cfg -fi