diff options
| author | Runar Borge <runar@borge.nu> | 2019-07-22 21:54:20 +0200 |
|---|---|---|
| committer | Runar Borge <runar@borge.nu> | 2019-07-22 21:54:20 +0200 |
| commit | 6056acfa06c2b79ee8981b9f36a1ced2dac29111 (patch) | |
| tree | 613944f1de089105950a86501507b6aa2151380d /tools/cloud-init/GCE | |
| parent | b229f0bd958a42c6faa345c91500c2ed8ccdc919 (diff) | |
| parent | 8c22ceead487b745d6b7c058c4d1c0a0eaa051c8 (diff) | |
| download | vyos-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')
| -rwxr-xr-x | tools/cloud-init/GCE/99-debug-user.chroot | 17 | ||||
| -rw-r--r-- | tools/cloud-init/GCE/config.boot.default | 1 | ||||
| -rw-r--r-- | tools/cloud-init/GCE/config.boot.default-debug | 1 |
3 files changed, 2 insertions, 17 deletions
diff --git a/tools/cloud-init/GCE/99-debug-user.chroot b/tools/cloud-init/GCE/99-debug-user.chroot deleted file mode 100755 index 7b72f898..00000000 --- a/tools/cloud-init/GCE/99-debug-user.chroot +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# Script to add a user to Linux system -if [ $(id -u) -eq 0 ]; then - egrep "^debuguser" /etc/passwd >/dev/null - if [ $? -eq 0 ]; then - echo "$username exists!" - exit 1 - else - pass=$(perl -e 'print crypt($ARGV[0], "password")' dKD3UKamS3MQ) - useradd -m -p $pass debuguser - usermod -aG sudo debuguser - [ $? -eq 0 ] && echo "User has been added to system!" || echo "Failed to add a user!" - fi -else - echo "Only root may add a user to the system" - exit 2 -fi 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 { diff --git a/tools/cloud-init/GCE/config.boot.default-debug b/tools/cloud-init/GCE/config.boot.default-debug index 9514e893..a51c3f4d 100644 --- a/tools/cloud-init/GCE/config.boot.default-debug +++ b/tools/cloud-init/GCE/config.boot.default-debug @@ -10,6 +10,7 @@ service { } } system { + host-name vyos syslog { global { facility all { |