From dc90316d3312434280eb94a01005412eaaa34484 Mon Sep 17 00:00:00 2001 From: Ezri Zhu Date: Thu, 2 Jan 2025 20:17:15 -0500 Subject: [PATCH 1/4] no findmnt --- try | 6 ------ 1 file changed, 6 deletions(-) diff --git a/try b/try index 3f8e059..c62f0a2 100755 --- a/try +++ b/try @@ -26,11 +26,6 @@ export TRY_COMMAND try() { START_DIR="$PWD" - if ! command -v findmnt >/dev/null - then - error "findmnt not found, please install util-linux" "$TRY_COMMAND" 2 - fi - if [ "$SANDBOX_DIR" ] then ## If the name of a sandbox is given then we need to exit prematurely if its directory doesn't exist @@ -78,7 +73,6 @@ try() { DIRS_AND_MOUNTS="$SANDBOX_DIR"/mounts export DIRS_AND_MOUNTS find / -maxdepth 1 >"$DIRS_AND_MOUNTS" - findmnt --real -r -o target -n >>"$DIRS_AND_MOUNTS" sort -u -o "$DIRS_AND_MOUNTS" "$DIRS_AND_MOUNTS" # Calculate UPDATED_DIRS_AND_MOUNTS that contains the merge arguments in LOWER_DIRS From 7a4149b128ee619bf2f966ab6a126a16141b6958 Mon Sep 17 00:00:00 2001 From: Ezri Zhu Date: Fri, 10 Jan 2025 18:08:41 -0500 Subject: [PATCH 2/4] update deps --- .github/workflows/test.yaml | 2 +- README.md | 1 - shell.nix | 1 - test/missing_unionfs_mergerfs.sh | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c923197..21f74b5 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -21,7 +21,7 @@ jobs: - name: Install dependencies run: | - sudo apt-get install util-linux expect mergerfs attr pandoc + sudo apt-get install expect mergerfs attr pandoc - name: Checkout uses: actions/checkout@v4 diff --git a/README.md b/README.md index d92a52f..7d8c64d 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,6 @@ commands that you don't already trust on your system, (i.e. network calls are al `try` relies on the following Debian packages -* `util-linux` (for standard Linux utilities, `findmnt`) * `attr` (for `getfattr`) * `pandoc` and `autoconf` (if working from a GitHub clone) diff --git a/shell.nix b/shell.nix index ecf1838..5c2c8f6 100644 --- a/shell.nix +++ b/shell.nix @@ -5,7 +5,6 @@ pkgs.mkShell { expect mergerfs attr - util-linux time shellcheck ]; diff --git a/test/missing_unionfs_mergerfs.sh b/test/missing_unionfs_mergerfs.sh index f486382..3e0a33a 100755 --- a/test/missing_unionfs_mergerfs.sh +++ b/test/missing_unionfs_mergerfs.sh @@ -42,7 +42,6 @@ run_nix() { pkgs.mkShell { buildInputs = with pkgs; [ attr - util-linux ]; } EOF From c7ab0ebd8db583a9d0f1b1b514c4acea15ec8f32 Mon Sep 17 00:00:00 2001 From: Ezri Zhu Date: Fri, 10 Jan 2025 18:09:37 -0500 Subject: [PATCH 3/4] remove mention of findmnt in code --- try | 7 ------- 1 file changed, 7 deletions(-) diff --git a/try b/try index c62f0a2..caa45d4 100755 --- a/try +++ b/try @@ -108,13 +108,6 @@ try() { # # KK 2023-06-29 This approach (of mounting each root directory separately) was necessary because we could not mount `/` in an overlay. # However, this might be solvable using mergerfs/unionfs, allowing us to mount an overlay on a unionfs of the `/` once. - # - # findmnt - # --real: only list real filesystems - # -n: no header - # -r: raw output - # -o target: only print the mount target - # then we want to exclude the root partition "/" while IFS="" read -r mountpoint do ## Only make the directory if the original is a directory too From 589f96f3af69dfa4ab7468929ed04738a12d2245 Mon Sep 17 00:00:00 2001 From: Ezri Zhu Date: Fri, 10 Jan 2025 21:01:04 -0500 Subject: [PATCH 4/4] docs --- try | 2 ++ 1 file changed, 2 insertions(+) diff --git a/try b/try index caa45d4..24e0838 100755 --- a/try +++ b/try @@ -217,6 +217,8 @@ do ## We should try to investigate either: ## 1. Not doing another overlay if we have done it for a parent directory (we can keep around a list of overlays and skip if we are in a child) ## 2. Do one unionfs+overlay at the root `/` once and be done with it! + ## + ## EZ 2025-01-10 We have removed findmnt since it is unneccessary #189 if [ -z "$UNION_HELPER" ] then