Unverified Commit 569ba66b authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #263741 from katexochen/mkosi/repart-fix 

mkosi: fix repart hardlink store leak into image
parents a1205b94 576aee41

pkgs/tools/virtualization/mkosi/default.nix

+10 −0
Original line number Diff line number Diff line
@@ -34,6 +34,16 @@ let 
        url = "https://github.com/systemd/systemd/commit/4947de275a5553399854cc748f4f13e4ae2ba069.patch";

        hash = "sha256-YIZZyc3f8pQO9fMAxiNhDdV8TtL4pXoh+hwHBzRWtfo=";

      })

      # repart: make sure rewinddir() is called before readdir() when performing rm -rf. Remove when upgrading to systemd 255.

      (fetchpatch {

        url = "https://github.com/systemd/systemd/commit/6bbb893b90e2dcb05fb310ba4608f9c9dc587845.patch";

        hash = "sha256-A6cF2QAeYHGc0u0V1JMxIcV5shzf5x3Q6K+blZOWSn4=";

      })

      # Set timezone to UTC when invoking mcopy. Remove when upgrading to systemd 255.

      (fetchpatch {

        url = "https://github.com/systemd/systemd/commit/b2942c76adc5bb6a3e073aa5cee57834ee3a9813.patch";

        hash = "sha256-phGln3Gs9p8CsEe+1laGrm9xcUJWVbNBW0W8oR9/7YU=";

      })

    ];

  })).override {

    withRepart = true;