From a8dacb76dec5cfa9514d7638987ca52b675c9251 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 17 Nov 2017 13:55:49 -0400 Subject: clean up qemu emulation binary when finalizing disk image This commit was sponsored by Denis Dzyubenko on Patreon. --- src/Propellor/Property/Qemu.hs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/Propellor/Property/Qemu.hs') diff --git a/src/Propellor/Property/Qemu.hs b/src/Propellor/Property/Qemu.hs index 4d9e8b1f..f204a0e1 100644 --- a/src/Propellor/Property/Qemu.hs +++ b/src/Propellor/Property/Qemu.hs @@ -19,9 +19,11 @@ foreignBinariesEmulated = (setup cleanup) -- -- Note that removing the binary will prevent using the chroot on the host -- system. -removeHostEmulationBinary :: Property DebianLike -removeHostEmulationBinary = tightenTargets $ - scriptProperty ["rm -f /usr/bin/qemu-*-static"] +-- +-- The FilePath is the path to the top of the chroot. +removeHostEmulationBinary :: FilePath -> Property Linux +removeHostEmulationBinary top = tightenTargets $ + scriptProperty ["rm -f " ++ top ++ "/usr/bin/qemu-*-static"] `assume` MadeChange -- | Check if the given System supports an Architecture. -- cgit v1.3-2-g0d8e