Use bcarnes' squashfs label patches instead of the dubious kludge

diff --git a/modules/libblkid-squashfs-nix-store-kludge.patch b/modules/libblkid-squashfs-nix-store-kludge.patch
deleted file mode 100644 (file)
index de971f7..0000000
--- a/modules/libblkid-squashfs-nix-store-kludge.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# This dubious kludge results from
-# https://github.com/NixOS/nixpkgs/pull/236656 requiring filesystems to have labels and
-# https://github.com/plougher/squashfs-tools/issues/59 squashfs not supporting labels.
-diff --git a/libblkid/src/superblocks/squashfs.c b/libblkid/src/superblocks/squashfs.c
-index 4db842493..ed7465882 100644
---- a/libblkid/src/superblocks/squashfs.c
-+++ b/libblkid/src/superblocks/squashfs.c
-@@ -45,6 +45,11 @@ static int probe_squashfs(blkid_probe pr, const struct blkid_idmag *mag)
- 
-       blkid_probe_sprintf_version(pr, "%u.%u", vermaj, vermin);
- 
-+      {
-+              char label_kludge[] = "nix-store";
-+              blkid_probe_set_label(pr, label_kludge, sizeof(label_kludge));
-+      }
-+
-       return 0;
- }
- 

diff --git a/modules/qemu-vm-isolation.nix b/modules/qemu-vm-isolation.nix
index 69bacde444273ae9076c4ffe1f8d8a160767259c..5467f29a366de753f2714a6001762d2ae821999b 100644 (file)
--- a/modules/qemu-vm-isolation.nix
+++ b/modules/qemu-vm-isolation.nix
@@ -49,6 +49,17 @@ let
       }/nix-store.img";
     squashfs =
       "${hostPkgs.callPackage (modulesPath + "/../lib/make-squashfs.nix") {
       }/nix-store.img";
     squashfs =
       "${hostPkgs.callPackage (modulesPath + "/../lib/make-squashfs.nix") {

+        squashfsTools = hostPkgs.squashfsTools.overrideAttrs (old: {
+          # We patch in support for squashfs labels because
+          # https://github.com/NixOS/nixpkgs/pull/236656 requires filesystems to have labels and
+          # https://github.com/plougher/squashfs-tools/issues/59 squashfs doesn't support labels
+          patches = (old.patches or []) ++ [ ./squashfs-tools-label.patch ];
+          buildInputs = (old.buildInputs or []) ++ [ hostPkgs.makeWrapper ];
+          postInstall = (old.postInstall or "") + ''
+            wrapProgram "$out/bin/mksquashfs" \
+              --append-flags "-label nix-store"
+          '';
+        });

         storeContents = config.virtualisation.additionalPaths;
       }}";
   };
         storeContents = config.virtualisation.additionalPaths;
       }}";
   };


@@ -61,8 +72,7 @@ in {
 
         erofs is more compact than ext4, but less mature.
 
 
         erofs is more compact than ext4, but less mature.
 

-        squashfs support currently requires a dubious kludge that results in these
-        VMs not being able to mount any other squashfs volumes besides the nix store.
+        squashfs is best, but requires patches to set the filesystem label.

       '';
       type = lib.types.enum [ "ext4" "erofs" "squashfs" ];
       default = "ext4";
       '';
       type = lib.types.enum [ "ext4" "erofs" "squashfs" ];
       default = "ext4";


@@ -76,8 +86,10 @@ in {
       nixpkgs.overlays = optional (cfg.nixStoreFilesystemType == "squashfs")
         (final: prev: {
           util-linux = prev.util-linux.overrideAttrs (old: {
       nixpkgs.overlays = optional (cfg.nixStoreFilesystemType == "squashfs")
         (final: prev: {
           util-linux = prev.util-linux.overrideAttrs (old: {

-            patches = (old.patches or [ ])
-              ++ [ ./libblkid-squashfs-nix-store-kludge.patch ];
+            # We patch in support for squashfs labels because
+            # https://github.com/NixOS/nixpkgs/pull/236656 requires filesystems to have labels and
+            # https://github.com/plougher/squashfs-tools/issues/59 squashfs doesn't support labels
+            patches = (old.patches or [ ]) ++ [ ./util-linux-squashfs-label.patch ];

           });
         });
 
           });
         });