diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2021-01-29 14:31:09 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2021-01-29 15:48:16 +0100 |
| commit | 785bbf9f39813fafd09ba10e1d3a6a1f2ff291c2 (patch) | |
| tree | ad674b2ff4d048352adc0fe7af488ccde898367c /pkg | |
| parent | 536094275dcdd385d6ec666edfb9644f6842ab96 (diff) | |
tools/create-gce-image.sh: setup ssh with empty password
We used to use ssh keys, but there are no partiuclar advantages
of using key over empty password. It just makes things more complex.
And the new image building code in pkg/build does not support keys.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/build/linux.go | 7 | ||||
| -rwxr-xr-x | pkg/build/linux_gen.sh | 2 | ||||
| -rw-r--r-- | pkg/build/linux_generated.go | 14 |
3 files changed, 9 insertions, 14 deletions
diff --git a/pkg/build/linux.go b/pkg/build/linux.go index c35e5795e..f08455c39 100644 --- a/pkg/build/linux.go +++ b/pkg/build/linux.go @@ -122,13 +122,6 @@ func (linux) createImage(params *Params, kernelPath string) error { if err := osutil.CopyFile(filepath.Join(tempDir, "disk.raw"), imageFile); err != nil { return err } - keyFile := filepath.Join(params.OutputDir, "key") - if err := osutil.CopyFile(filepath.Join(tempDir, "key"), keyFile); err != nil { - return err - } - if err := os.Chmod(keyFile, 0600); err != nil { - return err - } return nil } diff --git a/pkg/build/linux_gen.sh b/pkg/build/linux_gen.sh index d69e61bc7..c4de59ce0 100755 --- a/pkg/build/linux_gen.sh +++ b/pkg/build/linux_gen.sh @@ -7,5 +7,5 @@ set -eu echo -en '// Code generated by pkg/build/linux.go. DO NOT EDIT.\n\n' > linux_generated.go echo -en 'package build\n\n' >> linux_generated.go echo -en 'const createImageScript = `#!/bin/bash\n' >> linux_generated.go -cat ../../tools/create-gce-image.sh | grep -v '#' >> linux_generated.go +cat ../../tools/create-gce-image.sh | egrep -v '^\s*#' >> linux_generated.go echo -en '`\n\n' >> linux_generated.go diff --git a/pkg/build/linux_generated.go b/pkg/build/linux_generated.go index fa7256804..7362b634a 100644 --- a/pkg/build/linux_generated.go +++ b/pkg/build/linux_generated.go @@ -98,15 +98,17 @@ fi echo -en "127.0.0.1\tlocalhost\n" | sudo tee disk.mnt/etc/hosts echo "nameserver 8.8.8.8" | sudo tee -a disk.mnt/etc/resolve.conf -echo "ClientAliveInterval 420" | sudo tee -a disk.mnt/etc/ssh/sshd_config echo "syzkaller" | sudo tee disk.mnt/etc/hostname -rm -f key key.pub -ssh-keygen -f key -t rsa -N "" -sudo mkdir -p disk.mnt/root/.ssh -sudo cp key.pub disk.mnt/root/.ssh/authorized_keys -sudo chown root disk.mnt/root/.ssh/authorized_keys sudo mkdir -p disk.mnt/boot/grub +cat << EOF | sudo tee disk.mnt/etc/ssh/sshd_config +PermitRootLogin yes +PasswordAuthentication yes +PermitEmptyPasswords yes +ClientAliveInterval 420 +EOF +sudo sed -i "s#^root:\*:#root::#g" disk.mnt/etc/shadow + CMDLINE="" SYZ_CMDLINE_FILE="${SYZ_CMDLINE_FILE:-}" if [ "$SYZ_CMDLINE_FILE" != "" ]; then |