Adjust to newly-built JLL

JuliaContainerization · Mar 28, 2023 · 7854d6b · 7854d6b · staticfloat · Mar 28, 2023
1 parent 3abb89f
commit 7854d6b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/Project.toml b/Project.toml
@@ -19,7 +19,7 @@ UserNSSandbox_jll = "b88861f7-1d72-59dd-91e7-a8cc876a4984"
 Preferences = "1.2.5"
 Scratch = "1"
 Tar_jll = "1.34.0"
-UserNSSandbox_jll = "2022.3.30"
+UserNSSandbox_jll = "2023.3.27"
 julia = "1.6"
 
 [extras]

diff --git a/deps/build_local_sandbox.jl b/deps/build_local_sandbox.jl
@@ -14,6 +14,6 @@ set_preferences!(
 )
 set_preferences!(
     jll_uuid,
-    "userns_overlay_probe_path" => joinpath(sdir, "userns_overlay_probe");
+    "overlay_probe_path" => joinpath(sdir, "userns_overlay_probe");
     force=true,
 )
diff --git a/src/utils.jl b/src/utils.jl
@@ -240,9 +240,8 @@ end
 
 function find_persist_dir_root(rootfs_path::String, dir_hints::Vector{String} = default_persist_root_dirs(); verbose::Bool = false)
     function probe_overlay_mount(rootfs_path, mount_path; verbose::Bool = false, userxattr::Bool = false)
-        probe_exe = joinpath(dirname(UserNSSandbox_jll.sandbox_path), "userns_overlay_probe")
-
-        probe_args = String[]
+        probe_exe = UserNSSandbox_jll.overlay_probe_path
+	probe_args = String[]
         if verbose
             push!(probe_args, "--verbose")
         end