gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

repart-image: removing unshare (and util-linux dep) form systemd-repart invocation

Browse Source 
..
This commit is contained in:
Daniel Barter
2024-05-26 09:49:54 -07:00
parent 7780e5160e
commit d7a9d49c42
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/image/repart-image.nix
View File

@@ -10,7 +10,6 @@
, mypy , mypy
, systemd , systemd
, fakeroot , fakeroot
, util-linux
# filesystem tools # filesystem tools
, dosfstools , dosfstools
@@ -105,7 +104,6 @@ in
nativeBuildInputs = [ nativeBuildInputs = [
systemd systemd
fakeroot fakeroot
util-linux
] ++ lib.optionals (compression.enable) [ ] ++ lib.optionals (compression.enable) [
compressionPkg compressionPkg
] ++ fileSystemTools; ] ++ fileSystemTools;
@@ -148,7 +146,7 @@ in
runHook preBuild runHook preBuild
echo "Building image with systemd-repart..." echo "Building image with systemd-repart..."
unshare --map-root-user fakeroot systemd-repart \ fakeroot systemd-repart \
''${systemdRepartFlags[@]} \ ''${systemdRepartFlags[@]} \
${imageFileBasename}.raw \ ${imageFileBasename}.raw \
| tee repart-output.json | tee repart-output.json