commit 9d6c8e32974ba0aaff93221347fa31b71b0a3236
parent ac6a1878c3db30a4275f12008dcfe2c4e7287cf2
Author: I Mean I'm Just Saying <imeanimjustsaying@kiwifarms.st>
Date: Mon, 28 Sep 2026 12:05:05 -0400
common, docs: path examples name no user
The /run/media/<user>/ literals in the storage comments say <user>, and
the test fixtures mount under /run/media/operator/ (both sides of every
assertion; the three files 39/39). WORKTREES.md's queue-lock example
shows `cwd /path/to/checkout/editor`; fit-hooks.mjs's doubled-path
example says <user>.
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Diffstat:
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/WORKTREES.md b/WORKTREES.md
@@ -116,7 +116,7 @@ one is not, it **aborts** rather than starting:
```
queue-lock: ABORTING — this suite's ports are already in use.
- PORT=3011 pid 2244791 cwd /home/user/Projects/yt-dlp-transcript-browser/editor
+ PORT=3011 pid 2244791 cwd /path/to/checkout/editor
next-server (v16.2.3)
kill 2244791
```
diff --git a/common/controller/storageLocations.test.ts b/common/controller/storageLocations.test.ts
@@ -561,7 +561,7 @@ test("defaultStorage is still the empty list (the harness's assumption)", () =>
// The first version of this guard compared `stat(root).dev` with its parent's,
// and that is wrong for the only location on the production machine: a root is
// `join(mountpoint, relPath)`, `platter` is
-// `/run/media/user/<uuid>/archilyzer-media`, and a subdirectory is on the same
+// `/run/media/<user>/<uuid>/archilyzer-media`, and a subdirectory is on the same
// filesystem as its parent BY CONSTRUCTION. /channels reported "free space
// unknown" for a correctly mounted drive. A bind mount reads the same way.
diff --git a/common/controller/storageLocations.ts b/common/controller/storageLocations.ts
@@ -262,7 +262,7 @@ export async function volumeFreeBytes(opts: {
// THE BOUNDARY IS TESTED AT THE MOUNTPOINT, NEVER AT THE ROOT, and the
// first version of this got that wrong in the one way that matters on
// this machine. A location's root is `join(mountpoint, relPath)` — the
- // production `platter` is `/run/media/user/<uuid>/archilyzer-media`, a
+ // production `platter` is `/run/media/<user>/<uuid>/archilyzer-media`, a
// SUBDIRECTORY of the mountpoint — so the root and its parent are on the
// same filesystem BY CONSTRUCTION whenever `relPath` is non-empty, and
// comparing those two devices reported "free space unknown" for a
diff --git a/common/lib/storageVolumes.test.ts b/common/lib/storageVolumes.test.ts
@@ -139,7 +139,7 @@ test("available: an automounted root warns, and names its fstab line", async ()
await h.control({
// udisks mounts under /run/media/<user>/<uuid>. The mountpoint is what
// gives it away; the fstab query is not even made.
- identity: { target: "/run/media/user/" + UUID, fstype: "ext4", uuid: UUID },
+ identity: { target: "/run/media/operator/" + UUID, fstype: "ext4", uuid: UUID },
fstab: `UUID=${UUID}`,
});
const p = await probeLocation(loc(root), h.bins, {
@@ -169,7 +169,7 @@ test("available: a mount with no fstab entry warns too", async () => {
test("mounted-elsewhere: the recorded uuid is up under another mountpoint", async () => {
await withHarness(async (h) => {
- await h.control({ uuidTarget: "/run/media/user/" + UUID });
+ await h.control({ uuidTarget: "/run/media/operator/" + UUID });
const p = await probeLocation(
loc(path.join(h.dir, "gone", "archilyzer-media"), true),
h.bins,
@@ -178,10 +178,10 @@ test("mounted-elsewhere: the recorded uuid is up under another mountpoint", asyn
assert.equal(p.status, "mounted-elsewhere");
assert.equal(
p.candidateRoot,
- `/run/media/user/${UUID}/archilyzer-media`,
+ `/run/media/operator/${UUID}/archilyzer-media`,
);
// The sighting is live enough to write back as the location's volume.
- assert.equal(p.identity.known && p.identity.mountpoint, `/run/media/user/${UUID}`);
+ assert.equal(p.identity.known && p.identity.mountpoint, `/run/media/operator/${UUID}`);
assert.equal(p.identity.known && p.identity.fstype, "ext4");
assert.equal(p.freeBytes, undefined);
});
diff --git a/common/lib/storageVolumes.ts b/common/lib/storageVolumes.ts
@@ -356,7 +356,7 @@ export async function mountByUuid(
const said = res.stderr.trim() || res.stdout.trim();
return { ok: false, error: said || `udisksctl mount failed for ${uuid}` };
}
- // "Mounted /dev/sdb1 at /run/media/user/<uuid>." — the trailing period is
+ // "Mounted /dev/sdb1 at /run/media/<user>/<uuid>." — the trailing period is
// part of the message and not part of the path.
const m = /\bat\s+(.+?)\.?\s*$/m.exec(res.stdout.trim());
return { ok: true, mountpoint: m ? m[1] : undefined };
diff --git a/common/views/storage.test.ts b/common/views/storage.test.ts
@@ -60,7 +60,7 @@ test("an available location reports identity, free bytes, counts and a fresh pro
uuid: "09b5",
fstype: "ext4",
label: "platter",
- mountpoint: "/run/media/user/09b5",
+ mountpoint: "/run/media/operator/09b5",
relPath: "archilyzer-media",
},
freeBytes: 1024,
@@ -68,7 +68,7 @@ test("an available location reports identity, free bytes, counts and a fresh pro
probedAt: NOW - 4_000,
};
const { rows } = buildStorageRows({
- locations: [loc("cold", "/run/media/user/09b5/archilyzer-media")],
+ locations: [loc("cold", "/run/media/operator/09b5/archilyzer-media")],
defaultLocationId: "cold",
probes: { cold: probe },
rollups: { cold: rollup({ locationId: "cold", total: 3, ok: 2, unreachable: 1 }) },
@@ -81,7 +81,7 @@ test("an available location reports identity, free bytes, counts and a fresh pro
assert.equal(row.isDefault, true);
assert.equal(
row.identity,
- "platter · ext4 · UUID 09b5 · at /run/media/user/09b5",
+ "platter · ext4 · UUID 09b5 · at /run/media/operator/09b5",
);
assert.equal(row.freeBytes, 1024);
assert.equal(row.lastProbeAgeMs, 4_000);
@@ -124,10 +124,10 @@ test("mounted-elsewhere offers Re-point named after the candidate root", () => {
identity: {
known: true,
uuid: "09b5",
- mountpoint: "/run/media/user/09b5",
+ mountpoint: "/run/media/operator/09b5",
relPath: "media",
},
- candidateRoot: "/run/media/user/09b5/media",
+ candidateRoot: "/run/media/operator/09b5/media",
probedAt: NOW,
},
},
@@ -137,11 +137,11 @@ test("mounted-elsewhere offers Re-point named after the candidate root", () => {
});
const row = rows[0];
assert.equal(row.statusLabel, "Mounted elsewhere");
- assert.equal(row.candidateRoot, "/run/media/user/09b5/media");
+ assert.equal(row.candidateRoot, "/run/media/operator/09b5/media");
const repoint = action(row, "repoint");
assert.equal(repoint.offered, true);
- assert.equal(repoint.label, "Re-point to /run/media/user/09b5/media");
- assert.equal(repoint.newRoot, "/run/media/user/09b5/media");
+ assert.equal(repoint.label, "Re-point to /run/media/operator/09b5/media");
+ assert.equal(repoint.newRoot, "/run/media/operator/09b5/media");
// Two channels live there, so Delete is refused with the count and the root.
const del = action(row, "delete");
assert.equal(del.offered, false);
diff --git a/umtool/song/fit-hooks.mjs b/umtool/song/fit-hooks.mjs
@@ -90,7 +90,7 @@ const rms = (x, a, b) => {
};
// mk-mix-hooks resolves EVERY path against SONG_DATA, so it must be handed the
// relative names it was given -- an absolute path comes back doubled
-// (".../song/home/user/.../song/mk-overlays.json") and it dies on ENOENT.
+// (".../song/home/<user>/.../song/mk-overlays.json") and it dies on ENOENT.
const mix = (rel, env) => {
execFileSync("node", [path.join(DIR, "mk-mix-hooks.mjs"), SONG, OVL, rel],
{ env: { ...process.env, DRIVE, ...env }, stdio: ["ignore", "ignore", "inherit"] });
