summaryrefslogtreecommitdiff
path: root/tools/cloud-init/GCE/config.boot.default
diff options
context:
space:
mode:
authorRunar Borge <runar@borge.nu>2019-07-22 21:54:20 +0200
committerRunar Borge <runar@borge.nu>2019-07-22 21:54:20 +0200
commit6056acfa06c2b79ee8981b9f36a1ced2dac29111 (patch)
tree613944f1de089105950a86501507b6aa2151380d /tools/cloud-init/GCE/config.boot.default
parentb229f0bd958a42c6faa345c91500c2ed8ccdc919 (diff)
parent8c22ceead487b745d6b7c058c4d1c0a0eaa051c8 (diff)
downloadvyos-build-6056acfa06c2b79ee8981b9f36a1ced2dac29111.tar.gz
vyos-build-6056acfa06c2b79ee8981b9f36a1ced2dac29111.zip
Merge remote-tracking branch 'origin/current' into equuleus
fixed merge errors in: * scripts/live-build-config - kernel parameters * scripts/build-packages - fixed list of packages to compile
Diffstat (limited to 'tools/cloud-init/GCE/config.boot.default')
-rw-r--r--tools/cloud-init/GCE/config.boot.default1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/cloud-init/GCE/config.boot.default b/tools/cloud-init/GCE/config.boot.default
index a0cc398f..cac26936 100644
--- a/tools/cloud-init/GCE/config.boot.default
+++ b/tools/cloud-init/GCE/config.boot.default
@@ -1,4 +1,5 @@
system {
+ host-name vyos
syslog {
global {
facility all {