Skip to content

DO NOT MERGE: chore: image for the recovery drill #7964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
r-birkner wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

DO NOT MERGE: chore: image for the recovery drill #7964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bec665
ready for the drill
r-birkner Dec 5, 2025
60c6493
Trigger Build
r-birkner Dec 5, 2025
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
6 changes: 3 additions & 3 deletions ic-os/components/guestos/share/nns_public_key.pem
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-----BEGIN PUBLIC KEY-----
MIGCMB0GDSsGAQQBgtx8BQMBAgEGDCsGAQQBgtx8BQMCAQNhAIFMDm7HH6tYOwi9
gTc8JVw8NxsuhIY8mKTx4It0I10U+12cDNVG2WhfkToMCyzFNBWDv0tDkuRn25bW
W5u0y3FxEvhHLg1aTRRQX/10hLASkQkcX4e5iINGP5gJGguqrg==
MIGCMB0GDSsGAQQBgtx8BQMBAgEGDCsGAQQBgtx8BQMCAQNhAKMwQ4PjueBx4tbg
hqqHkSUA8YLAvTQw71fUMhYRvAK0xDxnU2f3YAoWisWMwdPxDQtHurZC5XkcMFMS
VzwcH57dxklgaPvWDV63lnRTGCcnKSGJtbPVkR4AkD7Vkg5E/Q==
-----END PUBLIC KEY-----
19 changes: 9 additions & 10 deletions ic-os/hostos/defs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,22 +72,21 @@ def image_deps(mode, _malicious = False):
"file_build_arg": prod_file_build_arg,
})

# Update dev rootfs
if "dev" in mode:
deps["rootfs"].pop("//rs/ic_os/release:config", None)
deps["rootfs"].update({"//rs/ic_os/release:config_dev": "/opt/ic/bin/config:0755"})
# Update rootfs for all variants
deps["rootfs"].pop("//rs/ic_os/release:config", None)
deps["rootfs"].update({"//rs/ic_os/release:config_dev": "/opt/ic/bin/config:0755"})

deps["rootfs"].pop("//rs/ic_os/release:hostos_tool", None)
deps["rootfs"].update({"//rs/ic_os/release:hostos_tool_dev": "/opt/ic/bin/hostos_tool:0755"})
deps["rootfs"].pop("//rs/ic_os/release:hostos_tool", None)
deps["rootfs"].update({"//rs/ic_os/release:hostos_tool_dev": "/opt/ic/bin/hostos_tool:0755"})

deps["rootfs"].pop("//rs/ic_os/release:guest_vm_runner", None)
deps["rootfs"].update({"//rs/ic_os/release:guest_vm_runner_dev": "/opt/ic/bin/guest_vm_runner:0755"})
deps["rootfs"].pop("//rs/ic_os/release:guest_vm_runner", None)
deps["rootfs"].update({"//rs/ic_os/release:guest_vm_runner_dev": "/opt/ic/bin/guest_vm_runner:0755"})

# Allow root console access on dev
# Keep console override logic conditional on mode
if "dev" 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")
console_override_label_2 = Label("//ic-os/hostos:console-override-prod-alias")

Expand Down
1 change: 1 addition & 0 deletions ic-os/setupos/config/ssh_authorized_keys/admin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
# Each line of the file must only contain one key. For details on the format,
# please consult 'man authorized_keys'.
#
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMjH2YHX5y3CZnOA9Pfy7arG0O1Q/hGe5YJT4f+59wPp admin
2 changes: 1 addition & 1 deletion ic-os/setupos/data/deployment.json.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"logging": {},
"nns": {
"urls": NNS_URLS
"urls": ["https://ic29.farm.dfinity.systems/"]
},
"dev_vm_resources": {
"memory": "16",
Expand Down
7 changes: 3 additions & 4 deletions ic-os/setupos/defs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,9 @@ def image_deps(mode, _malicious = False):
"file_build_arg": prod_file_build_arg,
})

# Update dev rootfs
if "dev" in mode:
deps["rootfs"].pop("//rs/ic_os/release:config", None)
deps["rootfs"].update({"//rs/ic_os/release:config_dev": "/opt/ic/bin/config:0755"})
# Update rootfs for all variants
deps["rootfs"].pop("//rs/ic_os/release:config", None)
deps["rootfs"].update({"//rs/ic_os/release:config_dev": "/opt/ic/bin/config:0755"})

return deps

Expand Down
Loading