diff options
| author | Craig Jennings <c@cjennings.net> | 2026-01-19 11:16:37 -0600 |
|---|---|---|
| committer | Craig Jennings <c@cjennings.net> | 2026-01-19 11:16:37 -0600 |
| commit | cb2db4e8a6e7ebb6f3a9c2f743543fdff54f576e (patch) | |
| tree | e7209e25679d5f6396c8a541c882d2aa8dbf08fd /scripts/build-release | |
| parent | 061beaf62d6a28d38e2e8dec8c94b0d8b170ccc7 (diff) | |
| download | archangel-cb2db4e8a6e7ebb6f3a9c2f743543fdff54f576e.tar.gz archangel-cb2db4e8a6e7ebb6f3a9c2f743543fdff54f576e.zip | |
Update build-release for TrueNAS and Framework drives
- Use cjennings@truenas.local instead of root (has SSH keys)
- Remove removable check for ARCHZFS drives (Framework expansion
cards show as internal but are hot-swappable)
- Still requires 'yes' confirmation before dd for safety
Diffstat (limited to 'scripts/build-release')
| -rwxr-xr-x | scripts/build-release | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/scripts/build-release b/scripts/build-release index 030a88b..c5ec921 100755 --- a/scripts/build-release +++ b/scripts/build-release @@ -111,14 +111,10 @@ find_archzfs_drive() { ARCHZFS_DISK=$(lsblk -no PKNAME "$ARCHZFS_DEV" 2>/dev/null | head -1) if [[ -n "$ARCHZFS_DISK" ]]; then ARCHZFS_DISK="/dev/$ARCHZFS_DISK" - # Verify it's removable (USB) - REMOVABLE=$(lsblk -no RM "$ARCHZFS_DISK" 2>/dev/null | head -1) - if [[ "$REMOVABLE" == "1" ]]; then - info "Found ARCHZFS USB drive: $ARCHZFS_DISK" - return 0 - else - warn "ARCHZFS label found on $ARCHZFS_DISK but it's not removable, skipping" - fi + # Note: Don't check for removable - Framework expansion cards + # show as internal drives but are actually hot-swappable + info "Found ARCHZFS drive: $ARCHZFS_DISK" + return 0 fi fi ARCHZFS_DISK="" @@ -217,10 +213,10 @@ distribute_truenas() { # Remove old ISOs and copy new one info "Removing old ISOs from TrueNAS..." - $ssh_cmd "root@$TRUENAS_HOST" "rm -f $TRUENAS_PATH/archzfs-*.iso" 2>/dev/null || true + $ssh_cmd "cjennings@$TRUENAS_HOST" "rm -f $TRUENAS_PATH/archzfs-*.iso" 2>/dev/null || true info "Copying to $TRUENAS_HOST:$TRUENAS_PATH/" - if $scp_cmd "$ISO_FILE" "root@$TRUENAS_HOST:$TRUENAS_PATH/"; then + if $scp_cmd "$ISO_FILE" "cjennings@$TRUENAS_HOST:$TRUENAS_PATH/"; then info "Done: $TRUENAS_HOST:$TRUENAS_PATH/$ISO_NAME" TRUENAS_SUCCESS=true else |
