tools/create-openbsd-*: fully functional images from scratch

* tools/create-openbsd-gce-ci: use config from /syzkaller

* Use syzkaller copy of src instead of a separate one.

* Using /dev/null disk in vm.conf

* Use KVM, enable doas, no longer symlink.

* Use a dummmy.img

* Revert "Use a dummmy.img"

This reverts commit 656b24d5e4573dde5e95c6158852001c7241e65a.
This commit is contained in:
Greg Steuck 2018-09-28 02:13:51 -07:00 committed by Dmitry Vyukov
parent 0c2fa87bc6
commit 0b624c8069
2 changed files with 4 additions and 9 deletions

View File

@ -35,13 +35,10 @@ pkg_add -I bash git gmake go llvm nano wget && echo pkg_add OK
echo 'set tty com0' > boot.conf
echo 'PasswordAuthentication no' >> /etc/ssh/sshd_config
echo 'pass in on egress proto tcp from any to any port 80 rdr-to 127.0.0.1 port 8080' >> /etc/pf.conf
echo 'permit keepenv nopass syzkaller as root' > /etc/doas.conf
mkdir /syzkaller
echo '/dev/sd1a /syzkaller ffs rw,noauto 1 0' >> /etc/fstab
rm -rf /usr/{src,ports}
ln -s /syzkaller/src /usr/src
ln -s /syzkaller/ports /usr/ports
EOF
cat >etc/installurl <<EOF
@ -64,7 +61,7 @@ cat >etc/rc.local <<EOF
test -x syz-ci || (
go get github.com/google/syzkaller/syz-ci &&
go build github.com/google/syzkaller/syz-ci)
./syz-ci -config /etc/config-openbsd.ci 2>&1 | tee syz-ci.log &
./syz-ci -config ./config-openbsd.ci 2>&1 | tee syz-ci.log &
EOF2
)
EOF
@ -80,15 +77,13 @@ EOF
cat >etc/vm.conf <<EOF
vm "syzkaller" {
disable
disk "/syzkaller/syzkaller.img"
disk "/dev/null"
local interface
owner syzkaller
allow instance { boot, disk, memory }
}
EOF
cp config-openbsd.ci etc/ || echo "No syz-ci config."
tar --owner=root --group=root -zcvf site${RELNO}.tgz install.site etc/*
# Autoinstall script.

View File

@ -124,7 +124,7 @@ set timeout 1800
spawn qemu-system-x86_64 -nographic -smp 2 \
-drive if=virtio,file=worker_disk.raw,format=raw -cdrom "${ISO_PATCHED}" \
-net nic,model=virtio -net user -boot once=d
-net nic,model=virtio -net user -boot once=d -m 4000 -enable-kvm
expect timeout { exit 1 } "boot>"
send "\n"