summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@cryptonomic.net>2022-01-11 01:14:58 -0500
committerAndrew Cady <d@cryptonomic.net>2022-01-11 01:14:58 -0500
commit8625a2997ab98edc22eaf51de57ed705ddcaba61 (patch)
treeffd4ae780f8a6bfe8cdfe98c09fd98b036cdfaed
parent799128b2e4b3f7cad1afe5ab237e7eed8038fc64 (diff)
ignore more errors
-rw-r--r--fsmgr.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/fsmgr.hs b/fsmgr.hs
index ed09669..dbde290 100644
--- a/fsmgr.hs
+++ b/fsmgr.hs
@@ -141,10 +141,10 @@ buildRoot config@DiskImageConfig{..} finalOut = do
141 mountpoint = finalOut <.> "mnt" 141 mountpoint = finalOut <.> "mnt"
142 cmd_ "sh -c" ["if mountpoint -q \"$0\"; then umount \"$0\"; fi", mountpoint] 142 cmd_ "sh -c" ["if mountpoint -q \"$0\"; then umount \"$0\"; fi", mountpoint]
143 143
144 let (abortion :: IO ()) = ignoreErrors' $ do 144 let (abortion :: IO ()) = do
145 cmd_ "umount" [mountpoint] 145 ignoreErrors' $ cmd_ (EchoStderr False) "umount" [mountpoint]
146 cmd_ "rmdir" [mountpoint] 146 ignoreErrors' $ cmd_ (EchoStderr False) "rmdir" [mountpoint]
147 cmd_ "rm -f" [out] 147 ignoreErrors' $ cmd_ (EchoStderr False) "rm -f" [out]
148 148
149 handle' abortion $ buildInitialImage config mountpoint out 149 handle' abortion $ buildInitialImage config mountpoint out
150 150