Skip to content

Commit 56a59a2

Browse files
authored
Merge branch 'main' into fix-4547
2 parents 34e993b + 4c33853 commit 56a59a2

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

docs/getting-started.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,21 +100,23 @@ kernel image with a Ubuntu 24.04 rootfs from our CI:
100100
```bash
101101
ARCH="$(uname -m)"
102102

103-
latest=$(wget "http://spec.ccfc.min.s3.amazonaws.com/?prefix=firecracker-ci/v1.10/$ARCH/vmlinux-5.10&list-type=2" -O - 2>/dev/null | grep -oP "(?<=<Key>)(firecracker-ci/v1.10/$ARCH/vmlinux-5\.10\.[0-9]{1,3})(?=</Key>)")
103+
latest=$(wget "http://spec.ccfc.min.s3.amazonaws.com/?prefix=firecracker-ci/v1.11/$ARCH/vmlinux-5.10&list-type=2" -O - 2>/dev/null | grep -oP "(?<=<Key>)(firecracker-ci/v1.11/$ARCH/vmlinux-5\.10\.[0-9]{1,3})(?=</Key>)")
104104

105105
# Download a linux kernel binary
106106
wget "https://s3.amazonaws.com/spec.ccfc.min/${latest}"
107107

108108
# Download a rootfs
109-
wget -O ubuntu-24.04.squashfs.upstream "https://s3.amazonaws.com/spec.ccfc.min/firecracker-ci/v1.10/${ARCH}/ubuntu-24.04.squashfs"
109+
wget -O ubuntu-24.04.squashfs.upstream "https://s3.amazonaws.com/spec.ccfc.min/firecracker-ci/v1.11/${ARCH}/ubuntu-24.04.squashfs"
110110

111111
# Create an ssh key for the rootfs
112112
unsquashfs ubuntu-24.04.squashfs.upstream
113113
ssh-keygen -f id_rsa -N ""
114114
cp -v id_rsa.pub squashfs-root/root/.ssh/authorized_keys
115115
mv -v id_rsa ./ubuntu-24.04.id_rsa
116-
# re-squash
117-
mksquashfs squashfs-root ubuntu-24.04.squashfs -all-root -noappend -comp zstd
116+
# create ext4 filesystem image
117+
sudo chown -R root:root squashfs-root
118+
truncate -s 400M ubuntu-24.04.ext4
119+
sudo mkfs.ext4 -d squashfs-root -F ubuntu-24.04.ext4
118120
```
119121

120122
### Getting a Firecracker Binary

tools/devtool

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -890,6 +890,7 @@ cmd_sh() {
890890

891891
cmd_sandbox() {
892892
cmd_build --release
893+
ensure_ci_artifacts
893894
cmd_sh "tmux new env PYTEST_ADDOPTS=--pdbcls=IPython.terminal.debugger:TerminalPdb PYTHONPATH=tests IPYTHONDIR=\$PWD/.ipython ipython -i ./tools/sandbox.py $@"
894895
}
895896

0 commit comments

Comments
 (0)