sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "debian: cloud hostname ignored by Jessie"

Browse Source
This commit is contained in:
Jenkins 2015-11-04 21:46:54 +00:00 committed by Gerrit Code Review
commit 63610993ed
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
elements/debian/install.d/10-cloud-opinions
View File

@ -37,5 +37,10 @@ if [ "$DIB_DEBIAN_ALT_INIT_PACKAGE" != "sysvinit" ]; then
/etc/apt/preferences.d/sysvinit > /etc/apt/preferences.d/sysvinit /etc/apt/preferences.d/sysvinit > /etc/apt/preferences.d/sysvinit
fi fi
# specify a hostname so that cloud-init does not default to (None) # Since Jessie, when either 'hostname' or 'fqdn' are in a config file, it
echo 'hostname: debian' > /etc/cloud/cloud.cfg.d/01_hostname.cfg # 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