From aa371f5c19d1696ae176d1a6a41cb239049b4584 Mon Sep 17 00:00:00 2001 From: Andrew Donnellan Date: Wed, 10 Dec 2025 13:23:51 +1100 Subject: tools/create-image.sh: update default Debian release to trixie Debian bullseye is now oldoldstable, so update the default release to trixie. While we're at it, update documentation references to old Debian releases to match. Signed-off-by: Andrew Donnellan --- docs/linux/setup_linux-host_qemu-vm_s390x-kernel.md | 10 +++++----- .../linux/setup_ubuntu-host_qemu-vm_x86-64-kernel.md | 20 ++++++++++---------- .../setup_ubuntu-host_virtualbox-vm_x86-64-kernel.md | 10 +++++----- .../setup_ubuntu-host_vmware-vm_x86-64-kernel.md | 8 ++++---- docs/linux/troubleshooting.md | 4 ++-- 5 files changed, 26 insertions(+), 26 deletions(-) (limited to 'docs/linux') diff --git a/docs/linux/setup_linux-host_qemu-vm_s390x-kernel.md b/docs/linux/setup_linux-host_qemu-vm_s390x-kernel.md index f0fab769c..e03abee2c 100644 --- a/docs/linux/setup_linux-host_qemu-vm_s390x-kernel.md +++ b/docs/linux/setup_linux-host_qemu-vm_s390x-kernel.md @@ -92,7 +92,7 @@ chmod +x create-image.sh ./create-image.sh -a s390x ``` -The result should be `$IMAGE/bullseye.img` disk image. +The result should be `$IMAGE/trixie.img` disk image. For additional options of `create-image.sh`, please refer to `./create-image.sh -h` @@ -106,7 +106,7 @@ Run: qemu-system-s390x \ -M s390-ccw-virtio -cpu max,zpci=on -m 4G -smp 2 \ -kernel $KERNEL/arch/s390/boot/bzImage \ - -drive file=$IMAGE/buster.img,if=virtio,format=raw \ + -drive file=$IMAGE/trixie.img,if=virtio,format=raw \ -append "rootwait root=/dev/vda net.ifnames=0 biosdevname=0" \ -net nic,model=virtio -net user,host=10.0.2.10,hostfwd=tcp:127.0.0.1:10021-:22 \ -display none -serial mon:stdio \ @@ -116,7 +116,7 @@ qemu-system-s390x \ After that you should be able to ssh to QEMU instance in another terminal: ``` bash -ssh -i $IMAGE/buster.id_rsa -p 10021 -o "StrictHostKeyChecking no" root@localhost +ssh -i $IMAGE/trixie.id_rsa -p 10021 -o "StrictHostKeyChecking no" root@localhost ``` If this fails with "too many tries", ssh may be passing default keys before @@ -147,8 +147,8 @@ variables `$GOPATH`, `$KERNEL` and `$IMAGE` with their actual values. "http": "127.0.0.1:56741", "workdir": "$GOPATH/src/github.com/google/syzkaller/workdir", "kernel_obj": "$KERNEL", - "image": "$IMAGE/buster.img", - "sshkey": "$IMAGE/buster.id_rsa", + "image": "$IMAGE/trixie.img", + "sshkey": "$IMAGE/trixie.id_rsa", "syzkaller": "$GOPATH/src/github.com/google/syzkaller", "procs": 8, "type": "qemu", diff --git a/docs/linux/setup_ubuntu-host_qemu-vm_x86-64-kernel.md b/docs/linux/setup_ubuntu-host_qemu-vm_x86-64-kernel.md index 3646cf046..53a1c7660 100644 --- a/docs/linux/setup_ubuntu-host_qemu-vm_x86-64-kernel.md +++ b/docs/linux/setup_ubuntu-host_qemu-vm_x86-64-kernel.md @@ -1,6 +1,6 @@ # Setup: Ubuntu host, QEMU vm, x86-64 kernel -These are the instructions on how to fuzz the x86-64 kernel in a QEMU with Ubuntu on the host machine and Debian Bullseye in the QEMU instances. +These are the instructions on how to fuzz the x86-64 kernel in a QEMU with Ubuntu on the host machine and Debian Trixie in the QEMU instances. In the instructions below, the `$VAR` notation (e.g. `$GCC`, `$KERNEL`, etc.) is used to denote paths to directories that are either created when executing the instructions (e.g. when unpacking GCC archive, a directory will be created), or that you have to create yourself before running the instructions. Substitute the values for those variables manually. @@ -136,9 +136,9 @@ Command: sudo apt install debootstrap ``` -### Create Debian Bullseye Linux image +### Create Debian Trixie Linux image -Create a Debian Bullseye Linux image with the minimal set of required packages. +Create a Debian Trixie Linux image with the minimal set of required packages. Command: ``` bash @@ -149,15 +149,15 @@ chmod +x create-image.sh ./create-image.sh ``` -The result should be `$IMAGE/bullseye.img` disk image. +The result should be `$IMAGE/trixie.img` disk image. ### OR Create Debian Linux image with a different version -To create a Debian image with a different version (e.g. buster, stretch, sid), specify the `--distribution` option. +To create a Debian image with a different version (e.g. bookworm, bullseye, sid), specify the `--distribution` option. Command: ``` bash -./create-image.sh --distribution buster +./create-image.sh --distribution bookworm ``` ### Image extra tools @@ -198,7 +198,7 @@ qemu-system-x86_64 \ -smp 2 \ -kernel $KERNEL/arch/x86/boot/bzImage \ -append "console=ttyS0 root=/dev/sda earlyprintk=serial net.ifnames=0" \ - -drive file=$IMAGE/bullseye.img,format=raw \ + -drive file=$IMAGE/trixie.img,format=raw \ -net user,host=10.0.2.10,hostfwd=tcp:127.0.0.1:10021-:22 \ -net nic,model=e1000 \ -enable-kvm \ @@ -230,7 +230,7 @@ After that you should be able to ssh to QEMU instance in another terminal. Command: ``` bash -ssh -i $IMAGE/bullseye.id_rsa -p 10021 -o "StrictHostKeyChecking no" root@localhost +ssh -i $IMAGE/trixie.id_rsa -p 10021 -o "StrictHostKeyChecking no" root@localhost ``` ### Troubleshooting @@ -259,8 +259,8 @@ variables `$GOPATH`, `$KERNEL` and `$IMAGE` with their actual values. "http": "127.0.0.1:56741", "workdir": "$GOPATH/src/github.com/google/syzkaller/workdir", "kernel_obj": "$KERNEL", - "image": "$IMAGE/bullseye.img", - "sshkey": "$IMAGE/bullseye.id_rsa", + "image": "$IMAGE/trixie.img", + "sshkey": "$IMAGE/trixie.id_rsa", "syzkaller": "$GOPATH/src/github.com/google/syzkaller", "procs": 8, "type": "qemu", diff --git a/docs/linux/setup_ubuntu-host_virtualbox-vm_x86-64-kernel.md b/docs/linux/setup_ubuntu-host_virtualbox-vm_x86-64-kernel.md index f5cde0fd5..cd8cca733 100644 --- a/docs/linux/setup_ubuntu-host_virtualbox-vm_x86-64-kernel.md +++ b/docs/linux/setup_ubuntu-host_virtualbox-vm_x86-64-kernel.md @@ -1,6 +1,6 @@ # Setup: Ubuntu host, VirtualBox vm, x86-64 kernel -These are the instructions on how to fuzz the x86-64 kernel in VirtualBox with Ubuntu on the host machine and Debian Bullseye in the virtual machines. +These are the instructions on how to fuzz the x86-64 kernel in VirtualBox with Ubuntu on the host machine and Debian Trixie in the virtual machines. In the instructions below, the `$VAR` notation (e.g. `$GCC`, `$KERNEL`, etc.) is used to denote paths to directories that are either created when executing the instructions (e.g. when unpacking GCC archive, a directory will be created), or that you have to create yourself before running the instructions. Substitute the values for those variables manually. @@ -16,15 +16,15 @@ Install debootstrap: sudo apt-get install debootstrap ``` -To create a Debian Bullseye Linux user space in the $USERSPACE dir do: +To create a Debian Trixie Linux user space in the $USERSPACE dir do: ``` sudo mkdir -p $USERSPACE -sudo debootstrap --include=openssh-server,curl,tar,gcc,libc6-dev,time,strace,sudo,less,psmisc,selinux-utils,policycoreutils,checkpolicy,selinux-policy-default,firmware-atheros,open-vm-tools --components=main,contrib,non-free bullseye $USERSPACE +sudo debootstrap --include=openssh-server,curl,tar,gcc,libc6-dev,time,strace,sudo,less,psmisc,selinux-utils,policycoreutils,checkpolicy,selinux-policy-default,firmware-atheros,open-vm-tools --components=main,contrib,non-free trixie $USERSPACE ``` Note: it is important to include the `open-vm-tools` package in the user space as it provides better VM management. -To create a Debian Bullseye Linux VMDK do: +To create a Debian Trixie Linux VMDK do: ``` wget https://raw.githubusercontent.com/google/syzkaller/master/tools/create-gce-image.sh -O create-gce-image.sh @@ -103,4 +103,4 @@ Syzkaller will create full clone VMs from the `debian` VM and then use ssh to co The `debian` VM will not be started and its disk will remain unmodified. If you get issues after `syz-manager` starts, consider running it with the `-debug` flag. -Also see [this page](/docs/troubleshooting.md) for troubleshooting tips. \ No newline at end of file +Also see [this page](/docs/troubleshooting.md) for troubleshooting tips. diff --git a/docs/linux/setup_ubuntu-host_vmware-vm_x86-64-kernel.md b/docs/linux/setup_ubuntu-host_vmware-vm_x86-64-kernel.md index 2aabb5a32..803f040da 100644 --- a/docs/linux/setup_ubuntu-host_vmware-vm_x86-64-kernel.md +++ b/docs/linux/setup_ubuntu-host_vmware-vm_x86-64-kernel.md @@ -1,6 +1,6 @@ # Setup: Ubuntu host, VMware vm, x86-64 kernel -These are the instructions on how to fuzz the x86-64 kernel in VMware Workstation with Ubuntu on the host machine and Debian Bullseye in the virtual machines. +These are the instructions on how to fuzz the x86-64 kernel in VMware Workstation with Ubuntu on the host machine and Debian Trixie in the virtual machines. In the instructions below, the `$VAR` notation (e.g. `$GCC`, `$KERNEL`, etc.) is used to denote paths to directories that are either created when executing the instructions (e.g. when unpacking GCC archive, a directory will be created), or that you have to create yourself before running the instructions. Substitute the values for those variables manually. @@ -16,15 +16,15 @@ Install debootstrap: sudo apt-get install debootstrap ``` -To create a Debian Bullseye Linux user space in the $USERSPACE dir do: +To create a Debian Trixie Linux user space in the $USERSPACE dir do: ``` sudo mkdir -p $USERSPACE -sudo debootstrap --include=openssh-server,curl,tar,gcc,libc6-dev,time,strace,sudo,less,psmisc,selinux-utils,policycoreutils,checkpolicy,selinux-policy-default,firmware-atheros,open-vm-tools --components=main,contrib,non-free bullseye $USERSPACE +sudo debootstrap --include=openssh-server,curl,tar,gcc,libc6-dev,time,strace,sudo,less,psmisc,selinux-utils,policycoreutils,checkpolicy,selinux-policy-default,firmware-atheros,open-vm-tools --components=main,contrib,non-free trixie $USERSPACE ``` Note: it is important to include the `open-vm-tools` package in the user space as it provides better VM management. -To create a Debian Bullseye Linux VMDK do: +To create a Debian Trixie Linux VMDK do: ``` wget https://raw.githubusercontent.com/google/syzkaller/master/tools/create-gce-image.sh -O create-gce-image.sh diff --git a/docs/linux/troubleshooting.md b/docs/linux/troubleshooting.md index ee706e5c3..227252531 100644 --- a/docs/linux/troubleshooting.md +++ b/docs/linux/troubleshooting.md @@ -47,8 +47,8 @@ Here are some things to check if there are problems running syzkaller. "http": "127.0.0.1:56741", "workdir": "$GOPATH/src/github.com/google/syzkaller/workdir", "kernel_obj": "$KERNEL", - "image": "$IMAGE/bullseye.img", - "sshkey": "$IMAGE/bullseye.id_rsa", + "image": "$IMAGE/trixie.img", + "sshkey": "$IMAGE/trixie.id_rsa", "syzkaller": "$GOPATH/src/github.com/google/syzkaller", "procs": 8, "type": "qemu", -- cgit mrf-deployment