diff options
| author | Craig Jennings <c@cjennings.net> | 2026-05-14 13:04:43 -0500 |
|---|---|---|
| committer | Craig Jennings <c@cjennings.net> | 2026-05-14 13:04:43 -0500 |
| commit | befc7e112aaa706f7fff926cc7337af1aab08171 (patch) | |
| tree | 079388bfe4773bb1075881e36f2a9e8705614a0f | |
| parent | eada697a11da5db8446108fed7573af809d222cc (diff) | |
| download | archangel-befc7e112aaa706f7fff926cc7337af1aab08171.tar.gz archangel-befc7e112aaa706f7fff926cc7337af1aab08171.zip | |
fix(install): drop dead zfsrollback copy from configure_zfs_tools
The 2026-04-27 consolidation (422d109) deleted installer/zfsrollback in favor of the unified zfssnapshot wrapper, but installer/archangel:configure_zfs_tools still tried to cp /usr/local/bin/zfsrollback to the installed system. With set -euo pipefail in effect, a fresh ISO + ZFS install would abort here with cp: cannot stat 'zfsrollback'. The bug shipped on main without anyone noticing because the 04-27 VM tests ran against an ISO built earlier that day, before the consolidation merged. No fresh ISO has been built since.
I also dropped the leftover profile/airootfs/usr/local/bin/zfsrollback file that build.sh no longer regenerates.
| -rwxr-xr-x | installer/archangel | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/installer/archangel b/installer/archangel index 107f03d..beee692 100755 --- a/installer/archangel +++ b/installer/archangel @@ -1104,13 +1104,10 @@ EOF configure_zfs_tools() { step "Installing ZFS Management Tools" - # Copy ZFS management scripts cp /usr/local/bin/zfssnapshot $MNTPOINT/usr/local/bin/zfssnapshot - cp /usr/local/bin/zfsrollback $MNTPOINT/usr/local/bin/zfsrollback chmod +x $MNTPOINT/usr/local/bin/zfssnapshot - chmod +x $MNTPOINT/usr/local/bin/zfsrollback - info "ZFS management scripts installed: zfssnapshot, zfsrollback" + info "ZFS management script installed: zfssnapshot" info "Tip: Install sanoid for automated snapshot retention." } |