Skip to content

Fix service disable mechanism to allow retry on failure #47

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

Merged
kristapsk merged 2 commits into from
Jan 7, 2026
Merged

Fix service disable mechanism to allow retry on failure #47

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6cbfbf
Initial plan
Copilot Jan 7, 2026
38d965b
Fix trap to only disable service on success or no-op
Copilot Jan 7, 2026
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
13 changes: 9 additions & 4 deletions files/etc/sv/grow-ssd/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@

set -eu

# Always mark service down when we exit (success, no-op, or error)
trap 'sv down /var/service/grow-ssd >/dev/null 2>&1 || true' 0

# Wait for /ssd to be mounted (up to 60 seconds)
MAX_WAIT=60
WAITED=0
Expand Down Expand Up @@ -36,6 +33,7 @@ case "$SSD_DEV" in
;;
*)
echo "grow-ssd: unable to detect source device for /ssd; skipping"
sv down /var/service/grow-ssd >/dev/null 2>&1 || true
exit 0
;;
esac
Expand Down Expand Up @@ -86,12 +84,16 @@ fi
case "$PART" in
''|*[!0-9]*)
echo "grow-ssd: unable to determine partition number from $SSD_DEV or no partition; skipping"
sv down /var/service/grow-ssd >/dev/null 2>&1 || true
exit 0
;;
esac

# Only run if partition can be grown
growpart --dry-run "$DISK" "$PART" >/dev/null 2>&1 || exit 0
growpart --dry-run "$DISK" "$PART" >/dev/null 2>&1 || {
sv down /var/service/grow-ssd >/dev/null 2>&1 || true
exit 0
}

echo "Growing partition $SSD_DEV"
growpart "$DISK" "$PART"
Expand All @@ -100,3 +102,6 @@ echo "Resizing filesystem on $SSD_DEV"
resize2fs "$SSD_DEV"

echo "grow-ssd completed"

# Disable the service after successful completion
sv down /var/service/grow-ssd >/dev/null 2>&1 || true