summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2019-10-04 13:53:27 -0400
committerAndrew Cady <d@jerkface.net>2019-10-04 13:56:04 -0400
commit716721cefd7e3ec707fca92f9a0102773a1cb232 (patch)
treee3448e9d7a59ebcf3f11a4034b82f83d72aa6398
parentcd7dc6266b415cf3c937fc3b3aa14fce999c6f0d (diff)
Revert "debugging" (partially)
This reverts commit 135be7235bc04af43ca7e3749096a4d1e00c3823.
-rw-r--r--fsmgr.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/fsmgr.hs b/fsmgr.hs
index 770c8bc..718c88d 100644
--- a/fsmgr.hs
+++ b/fsmgr.hs
@@ -45,7 +45,7 @@ buildRoot :: DiskImageConfig -> FilePath -> Action ()
45buildRoot config@DiskImageConfig{..} finalOut = do 45buildRoot config@DiskImageConfig{..} finalOut = do
46 let out = finalOut <.> "tmp" 46 let out = finalOut <.> "tmp"
47 mountpoint = finalOut <.> "mnt" 47 mountpoint = finalOut <.> "mnt"
48 cmd_ "sh -xc" ["! mountpoint \"$0\" || umount \"$0\" ", mountpoint] 48 cmd_ "sh -c" ["! mountpoint -q \"$0\" || umount \"$0\" ", mountpoint]
49 49
50 let (abortion :: IO ()) = ignoreErrors' $ do 50 let (abortion :: IO ()) = ignoreErrors' $ do
51 cmd_ "umount" [mountpoint] 51 cmd_ "umount" [mountpoint]
@@ -224,7 +224,7 @@ chrootImage target args =
224 224
225shakeBuildOneImage :: FilePath -> IO () 225shakeBuildOneImage :: FilePath -> IO ()
226shakeBuildOneImage target = 226shakeBuildOneImage target =
227 shake shakeOptions {shakeFiles = "_build", shakeVerbosity = Loud} $ do 227 shake shakeOptions {shakeFiles = "_build"} $ do
228 want [target -<.> "btrfs"] 228 want [target -<.> "btrfs"]
229 shakeRules 229 shakeRules
230 230