diff options
| author | Andrey Konovalov <andreyknvl@google.com> | 2020-03-13 00:32:32 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-03-13 07:44:43 +0100 |
| commit | d89275f2aaa8ae95a2bcb8e8f8b022708d2d6951 (patch) | |
| tree | 9dd63965cdab5e5e3e3d041fa39aba4072d57a50 /tools | |
| parent | d850e9d08467726cd94b6a9caaf8090c594721ba (diff) | |
executor, sys/linux: add ath9k usb descriptions
Among other things this changes timeout for USB programs from 2 to 3 seconds.
ath9k fuzzing also requires ath9k firmware to be present, so system images
need to be regenerated with the updated script.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/create-gce-image.sh | 2 | ||||
| -rwxr-xr-x | tools/create-image.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/create-gce-image.sh b/tools/create-gce-image.sh index bcb11d055..bc0de3f45 100755 --- a/tools/create-gce-image.sh +++ b/tools/create-gce-image.sh @@ -7,7 +7,7 @@ # # Prerequisites: # - you need a user-space system, a basic Debian system can be created with: -# sudo debootstrap --include=openssh-server,curl,tar,gcc,libc6-dev,time,strace,sudo,less,psmisc,selinux-utils,policycoreutils,checkpolicy,selinux-policy-default stable debian +# sudo debootstrap --include=openssh-server,curl,tar,gcc,libc6-dev,time,strace,sudo,less,psmisc,selinux-utils,policycoreutils,checkpolicy,selinux-policy-default,firmware-atheros --components=main,contrib,non-free stable debian # - you need kernel to use with image (e.g. arch/x86/boot/bzImage) # note: kernel modules are not supported # - you need grub: diff --git a/tools/create-image.sh b/tools/create-image.sh index f4af27c37..3a6db32d6 100755 --- a/tools/create-image.sh +++ b/tools/create-image.sh @@ -8,7 +8,7 @@ set -eux # Create a minimal Debian distribution in a directory. DIR=chroot -PREINSTALL_PKGS=openssh-server,curl,tar,gcc,libc6-dev,time,strace,sudo,less,psmisc,selinux-utils,policycoreutils,checkpolicy,selinux-policy-default +PREINSTALL_PKGS=openssh-server,curl,tar,gcc,libc6-dev,time,strace,sudo,less,psmisc,selinux-utils,policycoreutils,checkpolicy,selinux-policy-default,firmware-atheros # If ADD_PACKAGE is not defined as an external environment variable, use our default packages if [ -z ${ADD_PACKAGE+x} ]; then @@ -82,7 +82,7 @@ fi sudo rm -rf $DIR mkdir -p $DIR -sudo debootstrap --include=$PREINSTALL_PKGS $RELEASE $DIR +sudo debootstrap --include=$PREINSTALL_PKGS --components=main,contrib,non-free $RELEASE $DIR # Set some defaults and enable promtless ssh to the machine for root. sudo sed -i '/^root/ { s/:x:/::/ }' $DIR/etc/passwd |