Compare commits
2
Commits
v0.6.0-rc2
...
v0.6.0-rc4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
469a2e4651 | ||
|
|
518a22d87e |
@@ -66,6 +66,18 @@ worse than no alert, because one day it carries a security fix.
|
|||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
|
- **Installing the patch permanently blocked updating it.** `install.sh` does
|
||||||
|
`chmod +x update.sh`, and git recorded `update.sh` as `100644` — so the chmod was a
|
||||||
|
*tracked modification*, and `update.sh` refuses to run over a dirty tree. Install
|
||||||
|
once and you could never update again; the error even told you to run
|
||||||
|
`git checkout -- .`, which just undoes the exec bit so the next install can re-dirty
|
||||||
|
it. A real box sat on an old version for exactly this reason.
|
||||||
|
|
||||||
|
Fixed on both sides: the scripts `install.sh` chmods are now executable in git (so
|
||||||
|
the chmod is a no-op), and `update.sh`'s dirty check now looks at **content**, not
|
||||||
|
file mode — `git diff --numstat` reports `0 0` for a mode-only change. A test
|
||||||
|
asserts every script in `install.sh`'s chmod loop is already `100755` in git.
|
||||||
|
|
||||||
- **Nested snapshots were broken on TrueNAS 24.10 and 25.04, and had been all
|
- **Nested snapshots were broken on TrueNAS 24.10 and 25.04, and had been all
|
||||||
along.** `SYNC_BLOCK`'s wrapper spelled out the stock signature and forwarded five
|
along.** `SYNC_BLOCK`'s wrapper spelled out the stock signature and forwarded five
|
||||||
arguments — but those releases declare `restic_backup(middleware, job,
|
arguments — but those releases declare `restic_backup(middleware, job,
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ Clone it onto a **pool** (not the boot device — that is wiped on TrueNAS upgra
|
|||||||
then run `install.sh` as root:
|
then run `install.sh` as root:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
git clone https://git.onetick.ninja/flan/truenas-truecloud-patch.git \
|
git clone https://github.com/sudolulo/truenas-truecloud-patch.git \
|
||||||
/mnt/tank/truenas-truecloud-patch # replace `tank` with your pool
|
/mnt/tank/truenas-truecloud-patch # replace `tank` with your pool
|
||||||
cd /mnt/tank/truenas-truecloud-patch
|
cd /mnt/tank/truenas-truecloud-patch
|
||||||
sudo bash install.sh
|
sudo bash install.sh
|
||||||
|
|||||||
@@ -158,7 +158,7 @@ python3 /mnt/tank/truenas-truecloud-patch/patch/create_task.py verify
|
|||||||
| What you see | What it means |
|
| What you see | What it means |
|
||||||
|---|---|
|
|---|---|
|
||||||
| `[OK] providers`, `[OK]`/`[SKIP] nested_snapshots` | Fine. Nothing to do. |
|
| `[OK] providers`, `[OK]`/`[SKIP] nested_snapshots` | Fine. Nothing to do. |
|
||||||
| `WARNING: … pattern not found` (UI) | The Angular bundle changed. The UI dropdown reverts to Storj-only, but **backups keep working** — create tasks with `create_task.py` meanwhile, and [open an issue](https://git.onetick.ninja/flan/truenas-truecloud-patch/issues) with your TrueNAS version. |
|
| `WARNING: … pattern not found` (UI) | The Angular bundle changed. The UI dropdown reverts to Storj-only, but **backups keep working** — create tasks with `create_task.py` meanwhile, and [open an issue](https://github.com/sudolulo/truenas-truecloud-patch/issues) with your TrueNAS version. |
|
||||||
| `WARNING: truecloud-patch is NOT COMPATIBLE with this TrueNAS version` | This TrueNAS changed middleware underneath the patch, and the named module was **deliberately not applied** — see `incompatible.json` for exactly which assumption broke. TrueNAS is left stock, so nothing is half-patched. Check [TrueNAS compatibility](../README.md#truenas-compatibility), then `bash update.sh` once a release supports your version; it re-applies itself on the next boot. This is **not** the kill switch and needs no manual reset. |
|
| `WARNING: truecloud-patch is NOT COMPATIBLE with this TrueNAS version` | This TrueNAS changed middleware underneath the patch, and the named module was **deliberately not applied** — see `incompatible.json` for exactly which assumption broke. TrueNAS is left stock, so nothing is half-patched. Check [TrueNAS compatibility](../README.md#truenas-compatibility), then `bash update.sh` once a release supports your version; it re-applies itself on the next boot. This is **not** the kill switch and needs no manual reset. |
|
||||||
| `[FAIL] providers` | **Your B2/S3 backups will not run.** middlewared is fine, but the credential/URL handling is gone. Open an issue with your version. |
|
| `[FAIL] providers` | **Your B2/S3 backups will not run.** middlewared is fine, but the credential/URL handling is gone. Open an issue with your version. |
|
||||||
| `[FAIL] nested_snapshots` | The stock guard is back, so tasks with `snapshot = true` on a nested dataset will fail validation. Turn the option off on those tasks until it's fixed. |
|
| `[FAIL] nested_snapshots` | The stock guard is back, so tasks with `snapshot = true` on a nested dataset will fail validation. Turn the option off on those tasks until it's fixed. |
|
||||||
|
|||||||
+1
-1
@@ -109,7 +109,7 @@ If a module shows `[FAIL]`:
|
|||||||
risk.
|
risk.
|
||||||
4. **If the detail says the module doesn't exist**, a TrueNAS update renamed
|
4. **If the detail says the module doesn't exist**, a TrueNAS update renamed
|
||||||
or restructured the internal API.
|
or restructured the internal API.
|
||||||
[Open an issue](https://git.onetick.ninja/flan/truenas-truecloud-patch/issues)
|
[Open an issue](https://github.com/sudolulo/truenas-truecloud-patch/issues)
|
||||||
with your TrueNAS version number and the full verify output.
|
with your TrueNAS version number and the full verify output.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
+2
-2
@@ -4,7 +4,7 @@
|
|||||||
# Prerequisites: run as root on TrueNAS SCALE with middlewared running.
|
# Prerequisites: run as root on TrueNAS SCALE with middlewared running.
|
||||||
# Clone this repository to a persistent ZFS pool first:
|
# Clone this repository to a persistent ZFS pool first:
|
||||||
#
|
#
|
||||||
# git clone https://git.onetick.ninja/flan/truenas-truecloud-patch \
|
# git clone https://github.com/sudolulo/truenas-truecloud-patch \
|
||||||
# /mnt/<pool>/truenas-truecloud-patch
|
# /mnt/<pool>/truenas-truecloud-patch
|
||||||
# cd /mnt/<pool>/truenas-truecloud-patch && bash install.sh
|
# cd /mnt/<pool>/truenas-truecloud-patch && bash install.sh
|
||||||
#
|
#
|
||||||
@@ -72,7 +72,7 @@ done
|
|||||||
if [ ! -f "$PATCH_DIR/patch/apply.sh" ]; then
|
if [ ! -f "$PATCH_DIR/patch/apply.sh" ]; then
|
||||||
echo "ERROR: patch files not found at $PATCH_DIR/patch/" >&2
|
echo "ERROR: patch files not found at $PATCH_DIR/patch/" >&2
|
||||||
echo "Run install.sh from a clone of the repository on a persistent pool:" >&2
|
echo "Run install.sh from a clone of the repository on a persistent pool:" >&2
|
||||||
echo " git clone https://git.onetick.ninja/flan/truenas-truecloud-patch \\" >&2
|
echo " git clone https://github.com/sudolulo/truenas-truecloud-patch \\" >&2
|
||||||
echo " /mnt/<pool>/truenas-truecloud-patch" >&2
|
echo " /mnt/<pool>/truenas-truecloud-patch" >&2
|
||||||
echo " cd /mnt/<pool>/truenas-truecloud-patch && bash install.sh" >&2
|
echo " cd /mnt/<pool>/truenas-truecloud-patch && bash install.sh" >&2
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
+3
-3
@@ -111,7 +111,7 @@ def main():
|
|||||||
print(
|
print(
|
||||||
"[truecloud-patch] WARNING: filterByProviders pattern not found in any JS bundle.\n"
|
"[truecloud-patch] WARNING: filterByProviders pattern not found in any JS bundle.\n"
|
||||||
"[truecloud-patch] The TrueNAS webui may have been restructured in this version.\n"
|
"[truecloud-patch] The TrueNAS webui may have been restructured in this version.\n"
|
||||||
"[truecloud-patch] File an issue at https://git.onetick.ninja/flan/truenas-truecloud-patch\n"
|
"[truecloud-patch] File an issue at https://github.com/sudolulo/truenas-truecloud-patch\n"
|
||||||
f"[truecloud-patch] TrueNAS version info: {_tnversion()}"
|
f"[truecloud-patch] TrueNAS version info: {_tnversion()}"
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
@@ -136,7 +136,7 @@ def main():
|
|||||||
f"[truecloud-patch] WARNING: {count} replacement(s) in {path}; "
|
f"[truecloud-patch] WARNING: {count} replacement(s) in {path}; "
|
||||||
f"expected exactly 1 — skipping write to avoid corrupting the bundle.\n"
|
f"expected exactly 1 — skipping write to avoid corrupting the bundle.\n"
|
||||||
f"[truecloud-patch] File an issue at "
|
f"[truecloud-patch] File an issue at "
|
||||||
f"https://git.onetick.ninja/flan/truenas-truecloud-patch"
|
f"https://github.com/sudolulo/truenas-truecloud-patch"
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -154,7 +154,7 @@ def main():
|
|||||||
"[truecloud-patch] The UI is UNCHANGED and still works. This means the "
|
"[truecloud-patch] The UI is UNCHANGED and still works. This means the "
|
||||||
"pattern no longer fits this TrueNAS build.\n"
|
"pattern no longer fits this TrueNAS build.\n"
|
||||||
"[truecloud-patch] File an issue at "
|
"[truecloud-patch] File an issue at "
|
||||||
"https://git.onetick.ninja/flan/truenas-truecloud-patch"
|
"https://github.com/sudolulo/truenas-truecloud-patch"
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
Regular → Executable
@@ -94,3 +94,40 @@ class TestTheReadmeStaysAReadme:
|
|||||||
assert "24.10" in text[:text.index("## Install")], (
|
assert "24.10" in text[:text.index("## Install")], (
|
||||||
"the minimum TrueNAS version must be visible above the install steps"
|
"the minimum TrueNAS version must be visible above the install steps"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class TestInstallDoesNotDirtyTheCheckout:
|
||||||
|
"""install.sh chmod +x's scripts. If git records them as 100644, that chmod is a
|
||||||
|
TRACKED MODIFICATION -- and update.sh refuses to run over a dirty tree.
|
||||||
|
|
||||||
|
So installing once permanently blocked updating, for every user, with a message
|
||||||
|
telling them to `git checkout -- .` (which would just undo the exec bit and let
|
||||||
|
the next install re-dirty it). Found on a real box that had been stuck on an old
|
||||||
|
version for exactly this reason.
|
||||||
|
|
||||||
|
Every script install.sh makes executable must already be executable in git.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def test_every_chmodded_script_is_already_executable_in_git(self):
|
||||||
|
import re
|
||||||
|
import subprocess
|
||||||
|
|
||||||
|
with open(os.path.join(ROOT, "install.sh"), encoding="utf-8") as fh:
|
||||||
|
m = re.search(r"^for _exe in (.+?); do", fh.read(), re.M)
|
||||||
|
assert m, "could not find install.sh's chmod loop"
|
||||||
|
scripts = m.group(1).split()
|
||||||
|
|
||||||
|
out = subprocess.run(
|
||||||
|
["git", "ls-files", "-s", *scripts],
|
||||||
|
cwd=ROOT, capture_output=True, text=True, check=True,
|
||||||
|
).stdout
|
||||||
|
|
||||||
|
not_exec = [
|
||||||
|
line.split("\t")[-1] for line in out.strip().splitlines()
|
||||||
|
if not line.startswith("100755")
|
||||||
|
]
|
||||||
|
assert not not_exec, (
|
||||||
|
"install.sh chmod +x's these, but git records them as non-executable — "
|
||||||
|
"so installing dirties the checkout and update.sh then refuses to run:\n "
|
||||||
|
+ "\n ".join(not_exec)
|
||||||
|
)
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ cd "$PATCH_DIR"
|
|||||||
|
|
||||||
if ! git rev-parse --git-dir >/dev/null 2>&1; then
|
if ! git rev-parse --git-dir >/dev/null 2>&1; then
|
||||||
echo "ERROR: $PATCH_DIR is not a git clone — nothing to update." >&2
|
echo "ERROR: $PATCH_DIR is not a git clone — nothing to update." >&2
|
||||||
echo " Re-clone from https://git.onetick.ninja/flan/truenas-truecloud-patch" >&2
|
echo " Re-clone from https://github.com/sudolulo/truenas-truecloud-patch" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -136,9 +136,21 @@ fi
|
|||||||
|
|
||||||
# A dirty tree means someone edited or scp'd files in place; merging over that
|
# A dirty tree means someone edited or scp'd files in place; merging over that
|
||||||
# silently loses their changes, or conflicts halfway through.
|
# silently loses their changes, or conflicts halfway through.
|
||||||
if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
|
#
|
||||||
|
# CONTENT changes only. A mode-only change (100644 -> 100755) is not somebody's work
|
||||||
|
# and must not block an update -- and it is not hypothetical: install.sh chmod +x's
|
||||||
|
# these very scripts, so on any version where git recorded one as 100644, INSTALLING
|
||||||
|
# dirtied the checkout and update.sh then refused to run. Install once, and updating
|
||||||
|
# was blocked forever, with an error telling the user to `git checkout -- .` (which
|
||||||
|
# merely undoes the exec bit so the next install can re-dirty it). A real box sat on
|
||||||
|
# an old version for exactly this reason.
|
||||||
|
#
|
||||||
|
# `git diff --numstat` reports "0 0 file" for a mode-only change, so anything with a
|
||||||
|
# nonzero insert or delete count is a genuine edit.
|
||||||
|
_dirty=$(git diff --numstat HEAD -- . | awk '$1 != 0 || $2 != 0 { print $3 }')
|
||||||
|
if [ -n "$_dirty" ]; then
|
||||||
echo "ERROR: the working tree has uncommitted changes:" >&2
|
echo "ERROR: the working tree has uncommitted changes:" >&2
|
||||||
git status --short --untracked-files=no >&2
|
printf ' M %s\n' $_dirty >&2
|
||||||
echo "" >&2
|
echo "" >&2
|
||||||
echo " Refusing to update over them. Commit, stash, or discard them first:" >&2
|
echo " Refusing to update over them. Commit, stash, or discard them first:" >&2
|
||||||
echo " git -C $PATCH_DIR checkout -- ." >&2
|
echo " git -C $PATCH_DIR checkout -- ." >&2
|
||||||
|
|||||||
Reference in New Issue
Block a user