diff options
author | Andrew Cady <d@jerkface.net> | 2019-10-04 13:53:27 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2019-10-04 13:56:04 -0400 |
commit | 716721cefd7e3ec707fca92f9a0102773a1cb232 (patch) | |
tree | e3448e9d7a59ebcf3f11a4034b82f83d72aa6398 | |
parent | cd7dc6266b415cf3c937fc3b3aa14fce999c6f0d (diff) |
Revert "debugging" (partially)
This reverts commit 135be7235bc04af43ca7e3749096a4d1e00c3823.
-rw-r--r-- | fsmgr.hs | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -45,7 +45,7 @@ buildRoot :: DiskImageConfig -> FilePath -> Action () | |||
45 | buildRoot config@DiskImageConfig{..} finalOut = do | 45 | buildRoot 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 | ||
225 | shakeBuildOneImage :: FilePath -> IO () | 225 | shakeBuildOneImage :: FilePath -> IO () |
226 | shakeBuildOneImage target = | 226 | shakeBuildOneImage 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 | ||