Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ic-os/bootloader/setupos_boot_args.template
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Kernel cmdline parameters for launching the SetupOS.
# SetupOS uses a single boot configuration (no A/B partitioning)
BOOT_ARGS="root=PARTUUID=7C0A626E-E5EA-E543-B5C5-300EB8304DB7 console=ttyS0,115200 console=tty0 nomodeset video=1024x768 security=selinux selinux=1 enforcing=0"
BOOT_ARGS="root=PARTUUID=7C0A626E-E5EA-E543-B5C5-300EB8304DB7 console=ttyS0,115200 console=tty0 nomodeset video=1024x768 security=selinux selinux=1 enforcing=0 ic.setupos.run_checks=0"
1 change: 0 additions & 1 deletion ic-os/components/setupos/install-hostos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ function resize_partition() {
# And set up new split volumes
free=$(vgs --noheadings -o vg_free_count hostlvm | tr -d ' ')


if [[ $node_reward_type =~ ^type4.1$ ]]; then
each=$((free / 32))
for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30; do
Expand Down
3 changes: 3 additions & 0 deletions ic-os/hostos/defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ def image_deps(mode, _malicious = False):
# Allow root console access on dev
console_override_label_1 = Label("//ic-os/hostos:console-override-dev")
console_override_label_2 = Label("//ic-os/hostos:console-override-dev-alias")
elif "multi" in mode:
console_override_label_1 = Label("//ic-os/hostos:console-override-dev")
console_override_label_2 = Label("//ic-os/hostos:console-override-dev-alias")
else:
# Allow limited-console access on prod
console_override_label_1 = Label("//ic-os/hostos:console-override-prod")
Expand Down
6 changes: 3 additions & 3 deletions ic-os/setupos/defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def image_deps(mode, _malicious = False):
})

# Update dev rootfs
if "dev" in mode:
if "dev" in mode or "multi" in mode:
deps["rootfs"].pop("//rs/ic_os/release:config_tool", None)
deps["rootfs"].update({"//rs/ic_os/release:config_tool_dev": "/opt/ic/bin/config_tool:0755"})

Expand Down Expand Up @@ -100,7 +100,7 @@ def _custom_partitions(mode):
include_nns_public_key_override = False
deployment_environment = "mainnet"
elif mode == "multi":
guest_image = Label("//ic-os/guestos/envs/prod:disk-img.tar.zst")
guest_image = Label("//ic-os/guestos/envs/dev:disk-img.tar.zst")
host_image = Label("//ic-os/hostos/envs/multi:disk-img.tar.zst")
nns_urls = '["https://icp-api.io", "https://icp0.io", "https://ic0.app"]'
include_nns_public_key_override = False
Expand Down Expand Up @@ -129,7 +129,7 @@ def _custom_partitions(mode):
Label("//ic-os/setupos:config/ssh_authorized_keys/admin"): "ssh_authorized_keys/admin",
}

if "dev" in mode:
if "dev" in mode or "multi" in mode:
config_dict[Label("//ic-os/setupos:config/node_operator_private_key.pem")] = "node_operator_private_key.pem"

pkg_tar(
Expand Down
Loading