Skip to content

Commit aa371f5

Browse files
ajdlinuxa-nogikh
authored andcommitted
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 <ajd@linux.ibm.com>
1 parent 6e13aaf commit aa371f5

11 files changed

+34
-34
lines changed

docs/linux/setup_linux-host_qemu-vm_s390x-kernel.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ chmod +x create-image.sh
9292
./create-image.sh -a s390x
9393
```
9494

95-
The result should be `$IMAGE/bullseye.img` disk image.
95+
The result should be `$IMAGE/trixie.img` disk image.
9696

9797
For additional options of `create-image.sh`, please refer to `./create-image.sh -h`
9898

@@ -106,7 +106,7 @@ Run:
106106
qemu-system-s390x \
107107
-M s390-ccw-virtio -cpu max,zpci=on -m 4G -smp 2 \
108108
-kernel $KERNEL/arch/s390/boot/bzImage \
109-
-drive file=$IMAGE/buster.img,if=virtio,format=raw \
109+
-drive file=$IMAGE/trixie.img,if=virtio,format=raw \
110110
-append "rootwait root=/dev/vda net.ifnames=0 biosdevname=0" \
111111
-net nic,model=virtio -net user,host=10.0.2.10,hostfwd=tcp:127.0.0.1:10021-:22 \
112112
-display none -serial mon:stdio \
@@ -116,7 +116,7 @@ qemu-system-s390x \
116116
After that you should be able to ssh to QEMU instance in another terminal:
117117

118118
``` bash
119-
ssh -i $IMAGE/buster.id_rsa -p 10021 -o "StrictHostKeyChecking no" root@localhost
119+
ssh -i $IMAGE/trixie.id_rsa -p 10021 -o "StrictHostKeyChecking no" root@localhost
120120
```
121121

122122
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.
147147
"http": "127.0.0.1:56741",
148148
"workdir": "$GOPATH/src/github.com/google/syzkaller/workdir",
149149
"kernel_obj": "$KERNEL",
150-
"image": "$IMAGE/buster.img",
151-
"sshkey": "$IMAGE/buster.id_rsa",
150+
"image": "$IMAGE/trixie.img",
151+
"sshkey": "$IMAGE/trixie.id_rsa",
152152
"syzkaller": "$GOPATH/src/github.com/google/syzkaller",
153153
"procs": 8,
154154
"type": "qemu",

docs/linux/setup_ubuntu-host_qemu-vm_x86-64-kernel.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Setup: Ubuntu host, QEMU vm, x86-64 kernel
22

3-
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.
3+
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.
44

55
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.
66

@@ -136,9 +136,9 @@ Command:
136136
sudo apt install debootstrap
137137
```
138138

139-
### Create Debian Bullseye Linux image
139+
### Create Debian Trixie Linux image
140140

141-
Create a Debian Bullseye Linux image with the minimal set of required packages.
141+
Create a Debian Trixie Linux image with the minimal set of required packages.
142142

143143
Command:
144144
``` bash
@@ -149,15 +149,15 @@ chmod +x create-image.sh
149149
./create-image.sh
150150
```
151151

152-
The result should be `$IMAGE/bullseye.img` disk image.
152+
The result should be `$IMAGE/trixie.img` disk image.
153153

154154
### OR Create Debian Linux image with a different version
155155

156-
To create a Debian image with a different version (e.g. buster, stretch, sid), specify the `--distribution` option.
156+
To create a Debian image with a different version (e.g. bookworm, bullseye, sid), specify the `--distribution` option.
157157

158158
Command:
159159
``` bash
160-
./create-image.sh --distribution buster
160+
./create-image.sh --distribution bookworm
161161
```
162162

163163
### Image extra tools
@@ -198,7 +198,7 @@ qemu-system-x86_64 \
198198
-smp 2 \
199199
-kernel $KERNEL/arch/x86/boot/bzImage \
200200
-append "console=ttyS0 root=/dev/sda earlyprintk=serial net.ifnames=0" \
201-
-drive file=$IMAGE/bullseye.img,format=raw \
201+
-drive file=$IMAGE/trixie.img,format=raw \
202202
-net user,host=10.0.2.10,hostfwd=tcp:127.0.0.1:10021-:22 \
203203
-net nic,model=e1000 \
204204
-enable-kvm \
@@ -230,7 +230,7 @@ After that you should be able to ssh to QEMU instance in another terminal.
230230

231231
Command:
232232
``` bash
233-
ssh -i $IMAGE/bullseye.id_rsa -p 10021 -o "StrictHostKeyChecking no" root@localhost
233+
ssh -i $IMAGE/trixie.id_rsa -p 10021 -o "StrictHostKeyChecking no" root@localhost
234234
```
235235

236236
### Troubleshooting
@@ -259,8 +259,8 @@ variables `$GOPATH`, `$KERNEL` and `$IMAGE` with their actual values.
259259
"http": "127.0.0.1:56741",
260260
"workdir": "$GOPATH/src/github.com/google/syzkaller/workdir",
261261
"kernel_obj": "$KERNEL",
262-
"image": "$IMAGE/bullseye.img",
263-
"sshkey": "$IMAGE/bullseye.id_rsa",
262+
"image": "$IMAGE/trixie.img",
263+
"sshkey": "$IMAGE/trixie.id_rsa",
264264
"syzkaller": "$GOPATH/src/github.com/google/syzkaller",
265265
"procs": 8,
266266
"type": "qemu",

docs/linux/setup_ubuntu-host_virtualbox-vm_x86-64-kernel.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Setup: Ubuntu host, VirtualBox vm, x86-64 kernel
22

3-
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.
3+
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.
44

55
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.
66

@@ -16,15 +16,15 @@ Install debootstrap:
1616
sudo apt-get install debootstrap
1717
```
1818

19-
To create a Debian Bullseye Linux user space in the $USERSPACE dir do:
19+
To create a Debian Trixie Linux user space in the $USERSPACE dir do:
2020
```
2121
sudo mkdir -p $USERSPACE
22-
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
22+
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
2323
```
2424

2525
Note: it is important to include the `open-vm-tools` package in the user space as it provides better VM management.
2626

27-
To create a Debian Bullseye Linux VMDK do:
27+
To create a Debian Trixie Linux VMDK do:
2828

2929
```
3030
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
103103
The `debian` VM will not be started and its disk will remain unmodified.
104104

105105
If you get issues after `syz-manager` starts, consider running it with the `-debug` flag.
106-
Also see [this page](/docs/troubleshooting.md) for troubleshooting tips.
106+
Also see [this page](/docs/troubleshooting.md) for troubleshooting tips.

docs/linux/setup_ubuntu-host_vmware-vm_x86-64-kernel.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Setup: Ubuntu host, VMware vm, x86-64 kernel
22

3-
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.
3+
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.
44

55
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.
66

@@ -16,15 +16,15 @@ Install debootstrap:
1616
sudo apt-get install debootstrap
1717
```
1818

19-
To create a Debian Bullseye Linux user space in the $USERSPACE dir do:
19+
To create a Debian Trixie Linux user space in the $USERSPACE dir do:
2020
```
2121
sudo mkdir -p $USERSPACE
22-
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
22+
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
2323
```
2424

2525
Note: it is important to include the `open-vm-tools` package in the user space as it provides better VM management.
2626

27-
To create a Debian Bullseye Linux VMDK do:
27+
To create a Debian Trixie Linux VMDK do:
2828

2929
```
3030
wget https://raw.githubusercontent.com/google/syzkaller/master/tools/create-gce-image.sh -O create-gce-image.sh

docs/linux/troubleshooting.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ Here are some things to check if there are problems running syzkaller.
4747
"http": "127.0.0.1:56741",
4848
"workdir": "$GOPATH/src/github.com/google/syzkaller/workdir",
4949
"kernel_obj": "$KERNEL",
50-
"image": "$IMAGE/bullseye.img",
51-
"sshkey": "$IMAGE/bullseye.id_rsa",
50+
"image": "$IMAGE/trixie.img",
51+
"sshkey": "$IMAGE/trixie.id_rsa",
5252
"syzkaller": "$GOPATH/src/github.com/google/syzkaller",
5353
"procs": 8,
5454
"type": "qemu",

docs/syz-kfuzztest.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ enabled. Namely
2626

2727
Furthermore, as you will need to connect to the VM being tested through SSH and
2828
launch `syz-kfuzztest` _(a Go binary with LIBC dependencies)_, it is recommended
29-
to create an image for the kernel being fuzzed (e.g., a Debian Bullseye image).
29+
to create an image for the kernel being fuzzed (e.g., a Debian Trixie image).
3030
Detailed instructions on how to do this can be found in
3131
[this setup guide](linux/setup_ubuntu-host_qemu-vm_x86-64-kernel.md).
3232

docs/syz_testbed.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ other. The tool automates checking out syzkaller repos, building them, running
3131
"manager_config": {
3232
"target": "linux/amd64",
3333
"kernel_obj": "/tmp/linux-stable",
34-
"image": "/tmp/kernel-image/bullseye.img",
35-
"sshkey": "/tmp/kernel-image/bullseye.id_rsa",
34+
"image": "/tmp/kernel-image/trixie.img",
35+
"sshkey": "/tmp/kernel-image/trixie.id_rsa",
3636
"procs": 8,
3737
"type": "qemu",
3838
"vm": {

docs/translations/zh_CN/executing_syzkaller_programs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ make
3232
4. 将构建好的二进制文件和程序复制到待测试机器上(根据待测试机器,替换命令中的 `linux_amd64`
3333

3434
``` bash
35-
scp -P 10022 -i bullseye.img.key bin/linux_amd64/syz-execprog bin/linux_amd64/syz-executor program root@localhost:
35+
scp -P 10022 -i trixie.img.key bin/linux_amd64/syz-execprog bin/linux_amd64/syz-executor program root@localhost:
3636
```
3737

3838
5. 在待测试机器上运行程序

docs/translations/zh_CN/syz_testbed.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ syz-testbed 需要一个 JSON 配置文件。示例:
3232
"manager_config": {
3333
"target": "linux/amd64",
3434
"kernel_obj": "/tmp/linux-stable",
35-
"image": "/tmp/kernel-image/bullseye.img",
36-
"sshkey": "/tmp/kernel-image/bullseye.id_rsa",
35+
"image": "/tmp/kernel-image/trixie.img",
36+
"sshkey": "/tmp/kernel-image/trixie.id_rsa",
3737
"procs": 8,
3838
"type": "qemu",
3939
"vm": {

tools/create-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fi
1616

1717
# Variables affected by options
1818
ARCH=$(uname -m)
19-
RELEASE=bullseye
19+
RELEASE=trixie
2020
FEATURE=minimal
2121
SEEK=2047
2222
PERF=false

0 commit comments

Comments
 (0)