From 344835ffa1358a15c9e6140621969a13a514f60b Mon Sep 17 00:00:00 2001 From: LinuxSquare Date: Wed, 28 Aug 2024 20:59:00 +0200 Subject: [PATCH] system: fix systemupdate to match ansible --- system/files/base_systemupdate | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/system/files/base_systemupdate b/system/files/base_systemupdate index 15ceb25..2bdbf6a 100644 --- a/system/files/base_systemupdate +++ b/system/files/base_systemupdate @@ -159,15 +159,15 @@ subtaskTitle "New BE mounted" echo "" echo "┌──────────────────────────────────────────┐" -echo "│ 2. Update and Salt highstate │" +echo "│ 2. Update and Ansible highstate │" echo "└──────────────────────────────────────────┘" -subtaskTitle "Update Saltstack" +subtaskTitle "Update Ansible playbook" -chroot "${MOUNTPOINT}" /bin/bash -c "git -C /srv/salt pull" || systemupdateFailed +chroot "${MOUNTPOINT}" /bin/bash -c "git -C /srv/ansible/playbooks pull" || systemupdateFailed subtaskTitle "Update bootloader configs" -chroot "${MOUNTPOINT}" /bin/bash -c "salt-call state.sls system.bootloader" >/dev/null || systemupdateFailed +chroot "${MOUNTPOINT}" /bin/bash -c "ansible-playbook /srv/ansible/playbooks/system/bootloader.ansible.yml" >/dev/null || systemupdateFailed subtaskTitle "Alpine repositories & keyring update" chroot "${MOUNTPOINT}" /bin/bash -c "apk update" || systemupdateFailed @@ -176,7 +176,7 @@ subtaskTitle "Alpine packages update" chroot "${MOUNTPOINT}" /bin/bash -c "apk upgrade" || systemupdateFailed subtaskTitle "Salt highstate" -chroot "${MOUNTPOINT}" /bin/bash -c "salt-call state.highstate" >/dev/null || systemupdateFailed +chroot "${MOUNTPOINT}" /bin/bash -c "ansible-playbook /srv/ansible/playbooks/top.ansible.yml" >/dev/null || systemupdateFailed subtaskTitle "Generate new initial ramdisk" latest_kernel="$(chroot "${MOUNTPOINT}" /bin/bash -c 'echo $(apk search linux-lts | head -n1 | cut -d- -f3- | sed "s|r||")-lts')"