Skip to content

Commit b151fae

Browse files
authored
Merge pull request #596 from Kern--/no-cgroupv2
Disable cgroups v2 in our getting started guides
2 parents c4f9c73 + a3dcad1 commit b151fae

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

docs/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ configuration file has the following fields:
247247
{
248248
"firecracker_binary_path": "/usr/local/bin/firecracker",
249249
"kernel_image_path": "/var/lib/firecracker-containerd/runtime/hello-vmlinux.bin",
250-
"kernel_args": "console=ttyS0 noapic reboot=k panic=1 pci=off nomodules ro systemd.journald.forward_to_console systemd.unit=firecracker.target init=/sbin/overlay-init",
250+
"kernel_args": "console=ttyS0 noapic reboot=k panic=1 pci=off nomodules ro systemd.unified_cgroup_hierarchy=0 systemd.journald.forward_to_console systemd.unit=firecracker.target init=/sbin/overlay-init",
251251
"root_drive": "/var/lib/firecracker-containerd/runtime/default-rootfs.img",
252252
"cpu_template": "T2",
253253
"log_fifo": "fc-logs.fifo",

docs/logging.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ firecracker-runtime.json file.
99
{
1010
"firecracker_binary_path": "/usr/local/bin/firecracker",
1111
"kernel_image_path": "/var/lib/firecracker-containerd/runtime/default-vmlinux.bin",
12-
"kernel_args": "ro console=ttyS0 noapic reboot=k panic=1 pci=off nomodules systemd.journald.forward_to_console systemd.unit=firecracker.target init=/sbin/overlay-init",
12+
"kernel_args": "ro console=ttyS0 noapic reboot=k panic=1 pci=off nomodules systemd.unified_cgroup_hierarchy=0 systemd.journald.forward_to_console systemd.unit=firecracker.target init=/sbin/overlay-init",
1313
"root_drive": "/var/lib/firecracker-containerd/runtime/default-rootfs.img",
1414
"cpu_template": "T2",
1515
"log_levels": ["debug"],
@@ -48,7 +48,7 @@ info, error, warning, and debug are mutually exclusive and only one can be set a
4848
{
4949
"firecracker_binary_path": "/usr/local/bin/firecracker",
5050
"kernel_image_path": "/var/lib/firecracker-containerd/runtime/default-vmlinux.bin",
51-
"kernel_args": "ro console=ttyS0 noapic reboot=k panic=1 pci=off nomodules systemd.journald.forward_to_console systemd.unit=firecracker.target init=/sbin/overlay-init",
51+
"kernel_args": "ro console=ttyS0 noapic reboot=k panic=1 pci=off nomodules systemd.unified_cgroup_hierarchy=0 systemd.journald.forward_to_console systemd.unit=firecracker.target init=/sbin/overlay-init",
5252
"root_drive": "/var/lib/firecracker-containerd/runtime/default-rootfs.img",
5353
"cpu_template": "T2",
5454
"log:levels": ["info","firecracker:debug","firecracker-containerd:error"],

docs/quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ sudo tee /etc/containerd/firecracker-runtime.json <<EOF
214214
"log_fifo": "fc-logs.fifo",
215215
"log_levels": ["debug"],
216216
"metrics_fifo": "fc-metrics.fifo",
217-
"kernel_args": "console=ttyS0 noapic reboot=k panic=1 pci=off nomodules ro systemd.journald.forward_to_console systemd.unit=firecracker.target init=/sbin/overlay-init",
217+
"kernel_args": "console=ttyS0 noapic reboot=k panic=1 pci=off nomodules ro systemd.unified_cgroup_hierarchy=0 systemd.journald.forward_to_console systemd.unit=firecracker.target init=/sbin/overlay-init",
218218
"default_network_interfaces": [{
219219
"CNIConfig": {
220220
"NetworkName": "fcnet",

0 commit comments

Comments
 (0)