From ace759431fbd5dcea5ba641c28945e51d08f8ece Mon Sep 17 00:00:00 2001 From: Itxaka Date: Thu, 18 May 2023 16:00:59 +0200 Subject: [PATCH] Bump service to use kairos-agent instead of elemental (#231) --- packages/initrd/build.yaml | 6 +++--- packages/system/cloud-config/definition.yaml | 2 +- packages/system/cloud-config/oem/06_recovery.yaml | 4 ++-- packages/system/init-svc/openrc/cos-setup/definition.yaml | 2 +- .../openrc/cos-setup/files/etc/init.d/cos-setup-boot | 2 +- .../openrc/cos-setup/files/etc/init.d/cos-setup-network | 2 +- .../openrc/cos-setup/files/usr/bin/cos-setup-reconcile | 2 +- packages/system/init-svc/systemd/cos-setup-boot.service | 2 +- packages/system/init-svc/systemd/cos-setup-fs.service | 2 +- packages/system/init-svc/systemd/cos-setup-network.service | 2 +- .../system/init-svc/systemd/cos-setup-reconcile.service | 2 +- packages/system/init-svc/systemd/definition.yaml | 2 +- packages/system/suc-upgrade/definition.yaml | 2 +- packages/system/suc-upgrade/suc-upgrade.sh | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/initrd/build.yaml b/packages/initrd/build.yaml index 1793db4..bb495dd 100644 --- a/packages/initrd/build.yaml +++ b/packages/initrd/build.yaml @@ -7,10 +7,10 @@ copy: # The toolkit is required in module-setup and embedded in the initramfs. - package: category: "system" - name: "elemental-cli" + name: "kairos-agent" version: ">=0" - source: "/usr/bin/elemental" - destination: "/usr/bin/elemental" + source: "/usr/bin/kairos-agent" + destination: "/usr/bin/kairos-agent" - package: category: "dracut" name: "immutable-rootfs" diff --git a/packages/system/cloud-config/definition.yaml b/packages/system/cloud-config/definition.yaml index f8e36d3..692cc2c 100644 --- a/packages/system/cloud-config/definition.yaml +++ b/packages/system/cloud-config/definition.yaml @@ -1,3 +1,3 @@ name: "base-cloud-config" category: "system" -version: "0.1" \ No newline at end of file +version: "0.2.0" \ No newline at end of file diff --git a/packages/system/cloud-config/oem/06_recovery.yaml b/packages/system/cloud-config/oem/06_recovery.yaml index 7583499..a7d8f7a 100644 --- a/packages/system/cloud-config/oem/06_recovery.yaml +++ b/packages/system/cloud-config/oem/06_recovery.yaml @@ -25,6 +25,6 @@ stages: - | source /etc/os-release echo >> /etc/issue - echo "You are booting from recovery mode. Run 'cos-reset' to reset the system to $VERSION" >> /etc/issue - echo " or elemental upgrade to upgrade the active partition" >> /etc/issue + echo "You are booting from recovery mode. Run 'kairos-agent reset' to reset the system to $VERSION" >> /etc/issue + echo " or kairos-agent upgrade to upgrade the active partition" >> /etc/issue echo >> /etc/issue diff --git a/packages/system/init-svc/openrc/cos-setup/definition.yaml b/packages/system/init-svc/openrc/cos-setup/definition.yaml index 8f3b8ee..54b55a3 100644 --- a/packages/system/init-svc/openrc/cos-setup/definition.yaml +++ b/packages/system/init-svc/openrc/cos-setup/definition.yaml @@ -1,4 +1,4 @@ name: openrc category: init-svc -version: 0.2-8 +version: 0.3.0 description: "Experimental package for openrc support" diff --git a/packages/system/init-svc/openrc/cos-setup/files/etc/init.d/cos-setup-boot b/packages/system/init-svc/openrc/cos-setup/files/etc/init.d/cos-setup-boot index a5dc3f5..8893617 100755 --- a/packages/system/init-svc/openrc/cos-setup/files/etc/init.d/cos-setup-boot +++ b/packages/system/init-svc/openrc/cos-setup/files/etc/init.d/cos-setup-boot @@ -5,6 +5,6 @@ depend() { } start() { - elemental run-stage boot + kairos-agent run-stage boot eend 0 } \ No newline at end of file diff --git a/packages/system/init-svc/openrc/cos-setup/files/etc/init.d/cos-setup-network b/packages/system/init-svc/openrc/cos-setup/files/etc/init.d/cos-setup-network index b199407..c3817a5 100755 --- a/packages/system/init-svc/openrc/cos-setup/files/etc/init.d/cos-setup-network +++ b/packages/system/init-svc/openrc/cos-setup/files/etc/init.d/cos-setup-network @@ -6,6 +6,6 @@ depend() { } start() { - elemental run-stage network + kairos-agent run-stage network eend 0 } \ No newline at end of file diff --git a/packages/system/init-svc/openrc/cos-setup/files/usr/bin/cos-setup-reconcile b/packages/system/init-svc/openrc/cos-setup/files/usr/bin/cos-setup-reconcile index 35d094e..0db9c69 100755 --- a/packages/system/init-svc/openrc/cos-setup/files/usr/bin/cos-setup-reconcile +++ b/packages/system/init-svc/openrc/cos-setup/files/usr/bin/cos-setup-reconcile @@ -4,6 +4,6 @@ SLEEP_TIME=${SLEEP_TIME:-360} while : do - elemental run-stage "reconcile" + kairos-agent run-stage "reconcile" sleep "$SLEEP_TIME" done \ No newline at end of file diff --git a/packages/system/init-svc/systemd/cos-setup-boot.service b/packages/system/init-svc/systemd/cos-setup-boot.service index 8019992..839f1e6 100644 --- a/packages/system/init-svc/systemd/cos-setup-boot.service +++ b/packages/system/init-svc/systemd/cos-setup-boot.service @@ -5,7 +5,7 @@ Before=getty.target [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/usr/bin/elemental run-stage boot +ExecStart=/usr/bin/kairos-agent run-stage boot [Install] WantedBy=multi-user.target diff --git a/packages/system/init-svc/systemd/cos-setup-fs.service b/packages/system/init-svc/systemd/cos-setup-fs.service index a258bde..629e00a 100644 --- a/packages/system/init-svc/systemd/cos-setup-fs.service +++ b/packages/system/init-svc/systemd/cos-setup-fs.service @@ -8,7 +8,7 @@ Before=sysinit.target [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/usr/bin/elemental run-stage fs +ExecStart=/usr/bin/kairos-agent run-stage fs [Install] WantedBy=sysinit.target diff --git a/packages/system/init-svc/systemd/cos-setup-network.service b/packages/system/init-svc/systemd/cos-setup-network.service index e80830f..bab293d 100644 --- a/packages/system/init-svc/systemd/cos-setup-network.service +++ b/packages/system/init-svc/systemd/cos-setup-network.service @@ -7,7 +7,7 @@ Nice=19 IOSchedulingClass=2 IOSchedulingPriority=7 Type=oneshot -ExecStart=/usr/bin/elemental run-stage network +ExecStart=/usr/bin/kairos-agent run-stage network TimeoutStopSec=180 KillMode=process KillSignal=SIGINT diff --git a/packages/system/init-svc/systemd/cos-setup-reconcile.service b/packages/system/init-svc/systemd/cos-setup-reconcile.service index 865c111..f7f8372 100644 --- a/packages/system/init-svc/systemd/cos-setup-reconcile.service +++ b/packages/system/init-svc/systemd/cos-setup-reconcile.service @@ -6,7 +6,7 @@ Nice=19 IOSchedulingClass=2 IOSchedulingPriority=7 Type=oneshot -ExecStart=/bin/bash -c "systemd-inhibit /usr/bin/elemental run-stage reconcile" +ExecStart=/bin/bash -c "systemd-inhibit /usr/bin/kairos-agent run-stage reconcile" TimeoutStopSec=180 KillMode=process KillSignal=SIGINT diff --git a/packages/system/init-svc/systemd/definition.yaml b/packages/system/init-svc/systemd/definition.yaml index 19063d6..ecd5e21 100644 --- a/packages/system/init-svc/systemd/definition.yaml +++ b/packages/system/init-svc/systemd/definition.yaml @@ -1,3 +1,3 @@ name: systemd category: init-svc -version: 0.6.3-5 +version: 0.7.0 diff --git a/packages/system/suc-upgrade/definition.yaml b/packages/system/suc-upgrade/definition.yaml index bdff0d9..fcac087 100644 --- a/packages/system/suc-upgrade/definition.yaml +++ b/packages/system/suc-upgrade/definition.yaml @@ -1,3 +1,3 @@ name: "suc-upgrade" category: "system" -version: "0.1" \ No newline at end of file +version: "0.2.0" \ No newline at end of file diff --git a/packages/system/suc-upgrade/suc-upgrade.sh b/packages/system/suc-upgrade/suc-upgrade.sh index 38db2e3..18ea204 100644 --- a/packages/system/suc-upgrade/suc-upgrade.sh +++ b/packages/system/suc-upgrade/suc-upgrade.sh @@ -12,6 +12,6 @@ fi mount --rbind $HOST_DIR/dev /dev mount --rbind $HOST_DIR/run /run -elemental upgrade --directory / +kairos-agent upgrade --directory / nsenter -i -m -t 1 -- reboot exit 1 \ No newline at end of file