From 4bcc6bb09b97c4a3532b7d64e07df0d41c937d30 Mon Sep 17 00:00:00 2001 From: Eero Kelly Date: Fri, 19 Jun 2026 00:48:55 +0000 Subject: [PATCH 1/2] Dev testing --- ic-os/bootloader/setupos_boot_args.template | 2 +- ic-os/hostos/defs.bzl | 3 +++ ic-os/setupos/defs.bzl | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ic-os/bootloader/setupos_boot_args.template b/ic-os/bootloader/setupos_boot_args.template index 331ea42dbc8b..a3bcc700d17b 100644 --- a/ic-os/bootloader/setupos_boot_args.template +++ b/ic-os/bootloader/setupos_boot_args.template @@ -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" diff --git a/ic-os/hostos/defs.bzl b/ic-os/hostos/defs.bzl index 30ad54274a0e..e1a919c76d09 100644 --- a/ic-os/hostos/defs.bzl +++ b/ic-os/hostos/defs.bzl @@ -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") diff --git a/ic-os/setupos/defs.bzl b/ic-os/setupos/defs.bzl index 1feb0e51a32c..9b326f58914b 100644 --- a/ic-os/setupos/defs.bzl +++ b/ic-os/setupos/defs.bzl @@ -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"}) @@ -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 @@ -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( From aae5dd0ce34cabff67022b31c5e8367fe6dc14a6 Mon Sep 17 00:00:00 2001 From: IDX GitHub Automation Date: Fri, 19 Jun 2026 03:14:44 +0000 Subject: [PATCH 2/2] Automatically fixing code for linting and formatting issues --- ic-os/components/setupos/install-hostos.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ic-os/components/setupos/install-hostos.sh b/ic-os/components/setupos/install-hostos.sh index e13c28aa74f6..15f85e0bfd59 100755 --- a/ic-os/components/setupos/install-hostos.sh +++ b/ic-os/components/setupos/install-hostos.sh @@ -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