diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-02-14 12:25:42 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-02-14 12:25:45 +0000 |
commit | 3e1c1e8e5182f5f4dbbb822ceee168bd02f177d3 (patch) | |
tree | 0eea8b85d08b2d0257d596f6daa880e83ad4638f | |
parent | 442e2a6453ec380bf9d64f6be50e57d54ddf93d3 (diff) | |
download | fhs-dirs-baserock/sam/trove-upgrades.tar.gz |
Remove default /etc/hostnamebaserock/sam/trove-upgrades
When deploying a system image as an upgrade, the default hostname in /etc
will conflict with the hostname set in the base system and cause a merge
conflict in baserock-system-config-sync. From now on /etc/hostname should
only be created at deploy time.
-rw-r--r-- | fhs-dirs.morph | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fhs-dirs.morph b/fhs-dirs.morph index aaf9ec6..134982f 100644 --- a/fhs-dirs.morph +++ b/fhs-dirs.morph @@ -11,7 +11,6 @@ install-commands: - install -m 644 issue "$DESTDIR/etc/issue" - install -m 644 services "$DESTDIR/etc/services" - install -m 644 protocols "$DESTDIR/etc/protocols" -- echo baserock > "$DESTDIR"/etc/hostname devices: - filename: /dev/console uid: 0 |