diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-10-23 11:51:14 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-10-23 11:51:14 -0400 |
| commit | a1183efbcb6a2a3f62027aa452c99ac3be17c6b8 (patch) | |
| tree | aa91f6ae22d34ae4fda073371c33454a2c918637 | |
| parent | 83a07d5c56223fe31d64a691c9775b5d237a9f3f (diff) | |
propellor spin
| -rw-r--r-- | config-joey.hs | 3 | ||||
| -rw-r--r-- | src/Propellor/Property/Mount.hs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config-joey.hs b/config-joey.hs index 6ec80f92..ceabc252 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -84,8 +84,9 @@ darkstar = host "darkstar.kitenet.net" & imageBuilt "/tmp/img" c MSDOS (grubBooted PC) [ partition EXT2 `mountedAt` "/boot" `setFlag` BootFlag + `addFreeSpace` MegaBytes 200 , partition EXT4 `mountedAt` "/" - `addFreeSpace` MegaBytes 100 + `addFreeSpace` MegaBytes 200 , swapPartition (MegaBytes 256) ] where diff --git a/src/Propellor/Property/Mount.hs b/src/Propellor/Property/Mount.hs index 2496b1cc..a08f9e3b 100644 --- a/src/Propellor/Property/Mount.hs +++ b/src/Propellor/Property/Mount.hs @@ -150,7 +150,7 @@ findmntField field mnt = catchDefaultIO Nothing $ blkidTag :: String -> Source -> IO (Maybe String) blkidTag tag dev = catchDefaultIO Nothing $ headMaybe . filter (not . null) . lines - <$> readProcess "blkid" [dev, "-s", tag] + <$> readProcess "blkid" [dev, "-s", tag, "-o", "value"] -- | Unmounts a device or mountpoint, -- lazily so any running processes don't block it. |