Merge branch 'andrew/organize-utils-icos-group-6' into 'master'

Feat(NODE-1353): Consolidate rootfs utils #6

 

See merge request dfinity-lab/public/ic!19219

ic-os/rootfs/boundary-guestos.bzl

@@ -100,28 +100,28 @@ rootfs_files = {
     Label("boundary-guestos/var/www/html/uninstall-script.js"): "/var/www/html/uninstall-script.js",
 
     # consolidated files:
-    Label("systemd-generators/boundary-guestos/mount-generator"): "/etc/systemd/system-generators/mount-generator",
-    Label("systemd-generators/systemd-gpt-auto-generator"): "/etc/systemd/system-generators/systemd-gpt-auto-generator",
-    Label("save-machine-id/save-machine-id.sh"): "/opt/ic/bin/save-machine-id.sh",
-    Label("save-machine-id/save-machine-id.service"): "/etc/systemd/system/save-machine-id.service",
-    Label("utils/install-upgrade.sh"): "/opt/ic/bin/install-upgrade.sh",
-    Label("relabel-machine-id/relabel-machine-id.sh"): "/opt/ic/bin/relabel-machine-id.sh",
-    Label("relabel-machine-id/relabel-machine-id.service"): "/etc/systemd/system/relabel-machine-id.service",
-    Label("setup-hostname/setup-hostname.sh"): "/opt/ic/bin/setup-hostname.sh",
-    Label("setup-hostname/setup-hostname.service"): "/etc/systemd/system/setup-hostname.service",
-    Label("retry-ipv6-config/boundary-guestos/retry-ipv6-config.sh"): "/opt/ic/bin/retry-ipv6-config.sh",
-    Label("retry-ipv6-config/retry-ipv6-config.service"): "/etc/systemd/system/retry-ipv6-config.service",
     Label("ssh/setup-ssh-keys/setup-ssh-keys.sh"): "/opt/ic/bin/setup-ssh-keys.sh",
     Label("ssh/setup-ssh-keys/setup-ssh-keys.service"): "/etc/systemd/system/setup-ssh-keys.service",
     Label("ssh/setup-ssh-account-keys/boundary-guestos/setup-ssh-account-keys.sh"): "/opt/ic/bin/setup-ssh-account-keys.sh",
     Label("ssh/setup-ssh-account-keys/setup-ssh-account-keys.service"): "/etc/systemd/system/setup-ssh-account-keys.service",
     Label("generate-config/generate-dante-config.sh"): "/opt/ic/bin/generate-dante-config.sh",
     Label("generate-config/generate-network-config/boundary-guestos/generate-network-config.sh"): "/opt/ic/bin/generate-network-config.sh",
     Label("generate-config/generate-network-config/boundary-guestos/generate-network-config.service"): "/etc/systemd/system/generate-network-config.service",
-    Label("bootstrap-ic-node/boundary-guestos/bootstrap-ic-node.sh"): "/opt/ic/bin/bootstrap-ic-node.sh",
-    Label("bootstrap-ic-node/boundary-guestos/bootstrap-ic-node.service"): "/etc/systemd/system/bootstrap-ic-node.service",
-    Label("manageboot/boundary-guestos/manageboot.sh"): "/opt/ic/bin/manageboot.sh",
-    Label("setup-encryption/boundary-guestos/setup-encryption.sh"): "/opt/ic/bin/setup-encryption.sh",
-    Label("setup-encryption/boundary-guestos/setup-encryption.service"): "/etc/systemd/system/setup-encryption.service",
-    Label("setup-encryption/boundary-guestos/setup-var-encryption.sh"): "/opt/ic/bin/setup-var-encryption.sh",
+    Label("early-boot/save-machine-id/save-machine-id.sh"): "/opt/ic/bin/save-machine-id.sh",
+    Label("early-boot/save-machine-id/save-machine-id.service"): "/etc/systemd/system/save-machine-id.service",
+    Label("utils/install-upgrade.sh"): "/opt/ic/bin/install-upgrade.sh",
+    Label("early-boot/relabel-machine-id/relabel-machine-id.sh"): "/opt/ic/bin/relabel-machine-id.sh",
+    Label("early-boot/relabel-machine-id/relabel-machine-id.service"): "/etc/systemd/system/relabel-machine-id.service",
+    Label("early-boot/setup-hostname/setup-hostname.sh"): "/opt/ic/bin/setup-hostname.sh",
+    Label("early-boot/setup-hostname/setup-hostname.service"): "/etc/systemd/system/setup-hostname.service",
+    Label("init/bootstrap-ic-node/boundary-guestos/bootstrap-ic-node.sh"): "/opt/ic/bin/bootstrap-ic-node.sh",
+    Label("init/bootstrap-ic-node/boundary-guestos/bootstrap-ic-node.service"): "/etc/systemd/system/bootstrap-ic-node.service",
+    Label("init/setup-encryption/boundary-guestos/setup-encryption.sh"): "/opt/ic/bin/setup-encryption.sh",
+    Label("init/setup-encryption/boundary-guestos/setup-encryption.service"): "/etc/systemd/system/setup-encryption.service",
+    Label("init/setup-encryption/boundary-guestos/setup-var-encryption.sh"): "/opt/ic/bin/setup-var-encryption.sh",
+    Label("networking/retry-ipv6-config/boundary-guestos/retry-ipv6-config.sh"): "/opt/ic/bin/retry-ipv6-config.sh",
+    Label("networking/retry-ipv6-config/retry-ipv6-config.service"): "/etc/systemd/system/retry-ipv6-config.service",
+    Label("upgrade/manageboot/boundary-guestos/manageboot.sh"): "/opt/ic/bin/manageboot.sh",
+    Label("upgrade/systemd-generators/boundary-guestos/mount-generator"): "/etc/systemd/system-generators/mount-generator",
+    Label("upgrade/systemd-generators/systemd-gpt-auto-generator"): "/etc/systemd/system-generators/systemd-gpt-auto-generator",
 }

ic-os/rootfs/guestos.bzl

@@ -70,23 +70,9 @@ rootfs_files = {
     Label("//ic-os/rootfs/guestos:prep/systemd-fixes/systemd-fixes.te"): "/prep/systemd-fixes/systemd-fixes.te",
 
     # consolidated files:
-    Label("systemd-generators/guestos/mount-generator"): "/etc/systemd/system-generators/mount-generator",
-    Label("systemd-generators/systemd-gpt-auto-generator"): "/etc/systemd/system-generators/systemd-gpt-auto-generator",
     Label("utils/metrics.sh"): "/opt/ic/bin/metrics.sh",
-    Label("save-machine-id/save-machine-id.sh"): "/opt/ic/bin/save-machine-id.sh",
-    Label("save-machine-id/save-machine-id.service"): "/etc/systemd/system/save-machine-id.service",
     Label("setup-node_exporter-keys/setup-node_exporter-keys.sh"): "/opt/ic/bin/setup-node_exporter-keys.sh",
     Label("setup-node_exporter-keys/setup-node_exporter-keys.service"): "/etc/systemd/system/setup-node_exporter-keys.service",
-    Label("systemd-user/[email protected]"): "/etc/systemd/system/[email protected]",
-    Label("ipv4-connectivity-check/ipv4-connectivity-check.sh"): "/opt/ic/bin/ipv4-connectivity-check.sh",
-    Label("ipv4-connectivity-check/ipv4-connectivity-check.service"): "/etc/systemd/system/ipv4-connectivity-check.service",
-    Label("ipv4-connectivity-check/ipv4-connectivity-check.timer"): "/etc/systemd/system/ipv4-connectivity-check.timer",
-    Label("relabel-machine-id/guestos/relabel-machine-id.sh"): "/opt/ic/bin/relabel-machine-id.sh",
-    Label("relabel-machine-id/relabel-machine-id.service"): "/etc/systemd/system/relabel-machine-id.service",
-    Label("setup-hostname/setup-hostname.sh"): "/opt/ic/bin/setup-hostname.sh",
-    Label("setup-hostname/setup-hostname.service"): "/etc/systemd/system/setup-hostname.service",
-    Label("retry-ipv6-config/guestos/retry-ipv6-config.sh"): "/opt/ic/bin/retry-ipv6-config.sh",
-    Label("retry-ipv6-config/retry-ipv6-config.service"): "/etc/systemd/system/retry-ipv6-config.service",
     Label("utils/validate-replica-config.sh"): "/opt/ic/bin/validate-replica-config.sh",
     Label("ssh/provision-ssh-keys.sh"): "/opt/ic/bin/provision-ssh-keys.sh",
     Label("ssh/setup-ssh-keys/setup-ssh-keys.sh"): "/opt/ic/bin/setup-ssh-keys.sh",
@@ -97,35 +83,49 @@ rootfs_files = {
     Label("generate-config/generate-https-outcalls-adapter-config.sh"): "/opt/ic/bin/generate-https-outcalls-adapter-config.sh",
     Label("generate-config/generate-replica-config.sh"): "/opt/ic/bin/generate-replica-config.sh",
     Label("generate-config/generate-network-config/guestos/generate-network-config.service"): "/etc/systemd/system/generate-network-config.service",
-    Label("filebeat/setup-filebeat-permissions.sh"): "/opt/ic/bin/setup-filebeat-permissions.sh",
-    Label("filebeat/generate-filebeat-config.sh"): "/opt/ic/bin/generate-filebeat-config.sh",
-    Label("filebeat/filebeat.yml.template"): "/etc/filebeat/filebeat.yml.template",
-    Label("filebeat/filebeat.service"): "/etc/systemd/system/filebeat.service",
-    Label("filebeat/filebeat.fc"): "/prep/filebeat/filebeat.fc",
-    Label("filebeat/filebeat.if"): "/prep/filebeat/filebeat.if",
-    Label("filebeat/filebeat.te"): "/prep/filebeat/filebeat.te",
-    Label("bootstrap-ic-node/guestos/bootstrap-ic-node.sh"): "/opt/ic/bin/bootstrap-ic-node.sh",
-    Label("bootstrap-ic-node/guestos/bootstrap-ic-node.service"): "/etc/systemd/system/bootstrap-ic-node.service",
-    Label("manageboot/guestos/manageboot.sh"): "/opt/ic/bin/manageboot.sh",
-    Label("manageboot/guestos/manageboot.fc"): "/prep/manageboot/manageboot.fc",
-    Label("manageboot/guestos/manageboot.if"): "/prep/manageboot/manageboot.if",
-    Label("manageboot/guestos/manageboot.te"): "/prep/manageboot/manageboot.te",
-    Label("shared-resources/monitor-expand-shared-data/monitor-expand-shared-data.py"): "/opt/ic/bin/monitor-expand-shared-data.py",
-    Label("shared-resources/monitor-expand-shared-data/monitor-expand-shared-data.service"): "/etc/systemd/system/monitor-expand-shared-data.service",
-    Label("shared-resources/upgrade-shared-data-store/upgrade-shared-data-store.sh"): "/opt/ic/bin/upgrade-shared-data-store.sh",
-    Label("shared-resources/upgrade-shared-data-store/upgrade-shared-data-store.service"): "/etc/systemd/system/upgrade-shared-data-store.service",
-    Label("shared-resources/setup-shared-resources/setup-shared-backup.sh"): "/opt/ic/bin/setup-shared-backup.sh",
-    Label("shared-resources/setup-shared-resources/setup-shared-backup.service"): "/etc/systemd/system/setup-shared-backup.service",
-    Label("shared-resources/setup-shared-resources/setup-shared-crypto.sh"): "/opt/ic/bin/setup-shared-crypto.sh",
-    Label("shared-resources/setup-shared-resources/setup-shared-crypto.service"): "/etc/systemd/system/setup-shared-crypto.service",
-    Label("shared-resources/setup-shared-resources/setup-shared-data.sh"): "/opt/ic/bin/setup-shared-data.sh",
-    Label("shared-resources/setup-shared-resources/setup-shared-data.service"): "/etc/systemd/system/setup-shared-data.service",
-    Label("setup-encryption/guestos/setup-encryption.sh"): "/opt/ic/bin/setup-encryption.sh",
-    Label("setup-encryption/guestos/setup-encryption.service"): "/etc/systemd/system/setup-encryption.service",
-    Label("setup-encryption/guestos/setup-var-encryption.sh"): "/opt/ic/bin/setup-var-encryption.sh",
-    Label("ic-btc-adapter/generate-btc-adapter-config.sh"): "/opt/ic/bin/generate-btc-adapter-config.sh",
-    Label("ic-btc-adapter/ic-btc-mainnet-adapter.service"): "/etc/systemd/system/ic-btc-mainnet-adapter.service",
-    Label("ic-btc-adapter/ic-btc-mainnet-adapter.socket"): "/etc/systemd/system/ic-btc-mainnet-adapter.socket",
-    Label("ic-btc-adapter/ic-btc-testnet-adapter.service"): "/etc/systemd/system/ic-btc-testnet-adapter.service",
-    Label("ic-btc-adapter/ic-btc-testnet-adapter.socket"): "/etc/systemd/system/ic-btc-testnet-adapter.socket",
+    Label("early-boot/relabel-machine-id/guestos/relabel-machine-id.sh"): "/opt/ic/bin/relabel-machine-id.sh",
+    Label("early-boot/relabel-machine-id/relabel-machine-id.service"): "/etc/systemd/system/relabel-machine-id.service",
+    Label("early-boot/setup-hostname/setup-hostname.sh"): "/opt/ic/bin/setup-hostname.sh",
+    Label("early-boot/setup-hostname/setup-hostname.service"): "/etc/systemd/system/setup-hostname.service",
+    Label("early-boot/save-machine-id/save-machine-id.sh"): "/opt/ic/bin/save-machine-id.sh",
+    Label("early-boot/save-machine-id/save-machine-id.service"): "/etc/systemd/system/save-machine-id.service",
+    Label("init/bootstrap-ic-node/guestos/bootstrap-ic-node.sh"): "/opt/ic/bin/bootstrap-ic-node.sh",
+    Label("init/bootstrap-ic-node/guestos/bootstrap-ic-node.service"): "/etc/systemd/system/bootstrap-ic-node.service",
+    Label("init/setup-encryption/guestos/setup-encryption.sh"): "/opt/ic/bin/setup-encryption.sh",
+    Label("init/setup-encryption/guestos/setup-encryption.service"): "/etc/systemd/system/setup-encryption.service",
+    Label("init/setup-encryption/guestos/setup-var-encryption.sh"): "/opt/ic/bin/setup-var-encryption.sh",
+    Label("networking/retry-ipv6-config/guestos/retry-ipv6-config.sh"): "/opt/ic/bin/retry-ipv6-config.sh",
+    Label("networking/retry-ipv6-config/retry-ipv6-config.service"): "/etc/systemd/system/retry-ipv6-config.service",
+    Label("ic/ic-btc-adapter/generate-btc-adapter-config.sh"): "/opt/ic/bin/generate-btc-adapter-config.sh",
+    Label("ic/ic-btc-adapter/ic-btc-mainnet-adapter.service"): "/etc/systemd/system/ic-btc-mainnet-adapter.service",
+    Label("ic/ic-btc-adapter/ic-btc-mainnet-adapter.socket"): "/etc/systemd/system/ic-btc-mainnet-adapter.socket",
+    Label("ic/ic-btc-adapter/ic-btc-testnet-adapter.service"): "/etc/systemd/system/ic-btc-testnet-adapter.service",
+    Label("ic/ic-btc-adapter/ic-btc-testnet-adapter.socket"): "/etc/systemd/system/ic-btc-testnet-adapter.socket",
+    Label("monitoring/filebeat/setup-filebeat-permissions.sh"): "/opt/ic/bin/setup-filebeat-permissions.sh",
+    Label("monitoring/filebeat/generate-filebeat-config.sh"): "/opt/ic/bin/generate-filebeat-config.sh",
+    Label("monitoring/filebeat/filebeat.yml.template"): "/etc/filebeat/filebeat.yml.template",
+    Label("monitoring/filebeat/filebeat.service"): "/etc/systemd/system/filebeat.service",
+    Label("monitoring/filebeat/filebeat.fc"): "/prep/filebeat/filebeat.fc",
+    Label("monitoring/filebeat/filebeat.if"): "/prep/filebeat/filebeat.if",
+    Label("monitoring/filebeat/filebeat.te"): "/prep/filebeat/filebeat.te",
+    Label("monitoring/ipv4-connectivity-check/ipv4-connectivity-check.sh"): "/opt/ic/bin/ipv4-connectivity-check.sh",
+    Label("monitoring/ipv4-connectivity-check/ipv4-connectivity-check.service"): "/etc/systemd/system/ipv4-connectivity-check.service",
+    Label("monitoring/ipv4-connectivity-check/ipv4-connectivity-check.timer"): "/etc/systemd/system/ipv4-connectivity-check.timer",
+    Label("monitoring/systemd-user/[email protected]"): "/etc/systemd/system/[email protected]",
+    Label("upgrade/manageboot/guestos/manageboot.sh"): "/opt/ic/bin/manageboot.sh",
+    Label("upgrade/manageboot/guestos/manageboot.fc"): "/prep/manageboot/manageboot.fc",
+    Label("upgrade/manageboot/guestos/manageboot.if"): "/prep/manageboot/manageboot.if",
+    Label("upgrade/manageboot/guestos/manageboot.te"): "/prep/manageboot/manageboot.te",
+    Label("upgrade/shared-resources/monitor-expand-shared-data/monitor-expand-shared-data.py"): "/opt/ic/bin/monitor-expand-shared-data.py",
+    Label("upgrade/shared-resources/monitor-expand-shared-data/monitor-expand-shared-data.service"): "/etc/systemd/system/monitor-expand-shared-data.service",
+    Label("upgrade/shared-resources/upgrade-shared-data-store/upgrade-shared-data-store.sh"): "/opt/ic/bin/upgrade-shared-data-store.sh",
+    Label("upgrade/shared-resources/upgrade-shared-data-store/upgrade-shared-data-store.service"): "/etc/systemd/system/upgrade-shared-data-store.service",
+    Label("upgrade/shared-resources/setup-shared-resources/setup-shared-backup.sh"): "/opt/ic/bin/setup-shared-backup.sh",
+    Label("upgrade/shared-resources/setup-shared-resources/setup-shared-backup.service"): "/etc/systemd/system/setup-shared-backup.service",
+    Label("upgrade/shared-resources/setup-shared-resources/setup-shared-crypto.sh"): "/opt/ic/bin/setup-shared-crypto.sh",
+    Label("upgrade/shared-resources/setup-shared-resources/setup-shared-crypto.service"): "/etc/systemd/system/setup-shared-crypto.service",
+    Label("upgrade/shared-resources/setup-shared-resources/setup-shared-data.sh"): "/opt/ic/bin/setup-shared-data.sh",
+    Label("upgrade/shared-resources/setup-shared-resources/setup-shared-data.service"): "/etc/systemd/system/setup-shared-data.service",
+    Label("upgrade/systemd-generators/guestos/mount-generator"): "/etc/systemd/system-generators/mount-generator",
+    Label("upgrade/systemd-generators/systemd-gpt-auto-generator"): "/etc/systemd/system-generators/systemd-gpt-auto-generator",
 }

ic-os/rootfs/hostos.bzl

@@ -18,7 +18,6 @@ rootfs_files = {
     Label("hostos/etc/udev/rules.d/20-ipmi.rules"): "/etc/udev/rules.d/20-ipmi.rules",
     Label("hostos/opt/ic/bin/detect-first-boot.sh"): "/opt/ic/bin/detect-first-boot.sh",
     Label("hostos/opt/ic/bin/fetch-mgmt-mac.sh"): "/opt/ic/bin/fetch-mgmt-mac.sh",
-    Label("hostos/opt/ic/bin/manageboot.sh"): "/opt/ic/bin/manageboot.sh",
     Label("hostos/opt/ic/bin/setup-var.sh"): "/opt/ic/bin/setup-var.sh",
     Label("hostos/opt/ic/bin/start-guestos.sh"): "/opt/ic/bin/start-guestos.sh",
     Label("hostos/opt/ic/bin/stop-guestos.sh"): "/opt/ic/bin/stop-guestos.sh",
@@ -53,24 +52,25 @@ rootfs_files = {
     Label("hostos/etc/udev/rules.d/10-vhost-vsock.rules"): "/etc/udev/rules.d/10-vhost-vsock.rules",
 
     # consolidated files:
-    Label("systemd-generators/hostos/mount-generator"): "/etc/systemd/system-generators/mount-generator",
-    Label("systemd-generators/systemd-gpt-auto-generator"): "/etc/systemd/system-generators/systemd-gpt-auto-generator",
     Label("utils/metrics.sh"): "/opt/ic/bin/metrics.sh",
-    Label("save-machine-id/save-machine-id.sh"): "/opt/ic/bin/save-machine-id.sh",
-    Label("save-machine-id/save-machine-id.service"): "/etc/systemd/system/save-machine-id.service",
     Label("setup-node_exporter-keys/setup-node_exporter-keys.sh"): "/opt/ic/bin/setup-node_exporter-keys.sh",
     Label("setup-node_exporter-keys/setup-node_exporter-keys.service"): "/etc/systemd/system/setup-node_exporter-keys.service",
-    Label("systemd-user/[email protected]"): "/etc/systemd/system/[email protected]",
     Label("utils/install-upgrade.sh"): "/opt/ic/bin/install-upgrade.sh",
-    Label("relabel-machine-id/relabel-machine-id.sh"): "/opt/ic/bin/relabel-machine-id.sh",
-    Label("relabel-machine-id/relabel-machine-id.service"): "/etc/systemd/system/relabel-machine-id.service",
-    Label("setup-hostname/hostos/setup-hostname.sh"): "/opt/ic/bin/setup-hostname.sh",
-    Label("setup-hostname/hostos/setup-hostname.service"): "/etc/systemd/system/setup-hostname.service",
     Label("utils/hostos/fetch-property.sh"): "/opt/ic/bin/fetch-property.sh",
     Label("ssh/setup-ssh-keys/setup-ssh-keys.sh"): "/opt/ic/bin/setup-ssh-keys.sh",
     Label("ssh/setup-ssh-keys/setup-ssh-keys.service"): "/etc/systemd/system/setup-ssh-keys.service",
     Label("ssh/setup-ssh-account-keys/hostos/setup-ssh-account-keys.sh"): "/opt/ic/bin/setup-ssh-account-keys.sh",
     Label("ssh/setup-ssh-account-keys/hostos/setup-ssh-account-keys.service"): "/etc/systemd/system/setup-ssh-account-keys.service",
     Label("ssh/deploy-updated-ssh-account-keys/deploy-updated-ssh-account-keys.sh"): "/opt/ic/bin/deploy-updated-ssh-account-keys.sh",
     Label("ssh/deploy-updated-ssh-account-keys/deploy-updated-ssh-account-keys.service"): "/etc/systemd/system/deploy-updated-ssh-account-keys.service",
+    Label("early-boot/relabel-machine-id/relabel-machine-id.sh"): "/opt/ic/bin/relabel-machine-id.sh",
+    Label("early-boot/relabel-machine-id/relabel-machine-id.service"): "/etc/systemd/system/relabel-machine-id.service",
+    Label("early-boot/setup-hostname/hostos/setup-hostname.sh"): "/opt/ic/bin/setup-hostname.sh",
+    Label("early-boot/setup-hostname/hostos/setup-hostname.service"): "/etc/systemd/system/setup-hostname.service",
+    Label("early-boot/save-machine-id/save-machine-id.sh"): "/opt/ic/bin/save-machine-id.sh",
+    Label("early-boot/save-machine-id/save-machine-id.service"): "/etc/systemd/system/save-machine-id.service",
+    Label("monitoring/systemd-user/[email protected]"): "/etc/systemd/system/[email protected]",
+    Label("upgrade/manageboot/hostos/manageboot.sh"): "/opt/ic/bin/manageboot.sh",
+    Label("upgrade/systemd-generators/hostos/mount-generator"): "/etc/systemd/system-generators/mount-generator",
+    Label("upgrade/systemd-generators/systemd-gpt-auto-generator"): "/etc/systemd/system-generators/systemd-gpt-auto-generator",
 }

ic-os/rootfs/setupos.bzl

@@ -35,6 +35,6 @@ rootfs_files = {
     Label("setupos/prep/systemd-fixes/systemd-fixes.te"): "/prep/systemd-fixes/systemd-fixes.te",
 
     # consolidated files:
-    Label("systemd-generators/systemd-gpt-auto-generator"): "/etc/systemd/system-generators/systemd-gpt-auto-generator",
     Label("utils/setupos/fetch-property.sh"): "/opt/ic/bin/fetch-property.sh",
+    Label("upgrade/systemd-generators/systemd-gpt-auto-generator"): "/etc/systemd/system-generators/systemd-gpt-auto-generator",
 }