1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-08 02:43:54 +02:00

Define storeBRoot variable distinct from storeB URI.

This commit is contained in:
Ben Radford 2023-07-20 11:03:14 +01:00
parent 878c84d5ee
commit 2c66a093e0
No known key found for this signature in database
GPG key ID: 9DF5D4640AB888D5
5 changed files with 13 additions and 14 deletions

View file

@ -24,30 +24,30 @@ storeDirs () {
storeA="$storeVolume/store-a"
storeBTop="$storeVolume/store-b"
storeB="local-overlay?root=$storeVolume/merged-store&lower-store=$storeA&upper-layer=$storeBTop"
storeBRoot="$storeVolume/merged-store"
storeB="local-overlay?root=$storeBRoot&lower-store=$storeA&upper-layer=$storeBTop"
# Creating testing directories
mkdir -p "$storeVolume"/{store-a/nix/store,store-b,merged-store/nix/store,workdir}
}
# Mounting Overlay Store
mountOverlayfs () {
mergedStorePath="$storeVolume/merged-store/nix/store"
mount -t overlay overlay \
-o lowerdir="$storeA/nix/store" \
-o upperdir="$storeBTop" \
-o workdir="$storeVolume/workdir" \
"$mergedStorePath" \
"$storeBRoot/nix/store" \
|| skipTest "overlayfs is not supported"
cleanupOverlay () {
umount "$storeVolume/merged-store/nix/store"
umount "$storeBRoot/nix/store"
rm -r $storeVolume/workdir
}
trap cleanupOverlay EXIT
}
remountOverlayfs () {
mount -o remount "$mergedStorePath"
mount -o remount "$storeBRoot/nix/store"
}
toRealPath () {