diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-09-02 12:21:00 -0700 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-09-02 12:21:00 -0700 |
| commit | 1ac3495e9c3ac2a5e9118e143e2a9621746ee918 (patch) | |
| tree | 83f0ac9b39c70b0a790526b7400d5cb90e9d427b /src | |
| parent | b01d6fab5e8aa2120485884062ff3e03709ef626 (diff) | |
rename
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/DiskImage.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs index 7820c4c3..fe24496f 100644 --- a/src/Propellor/Property/DiskImage.hs +++ b/src/Propellor/Property/DiskImage.hs @@ -6,7 +6,7 @@ module Propellor.Property.DiskImage ( exists, MountPoint, PartSpec, - mountedPartition, + mountedAt, swapPartition, MkPartTable, fitChrootSize, @@ -45,8 +45,8 @@ import System.Posix.Files -- > & Apt.installed ["linux-image-amd64"] -- > & ... -- > partitions = DiskImage.fitChrootSize MSDOS --- > [ EXT2 `DiskImage.mountedPartition` "/boot" --- > , EXT4 `DiskImage.mountedPartition` "/" +-- > [ mkPartition EXT2 `DiskImage.mountedAt` "/boot" +-- > , mkPartition EXT4 `DiskImage.mountedAt` "/" -- > , DiskImage.swapPartition (MegaBytes 256) -- > ] -- > in DiskImage.built "/srv/images/foo.img" chroot partitions (DiskImage.grubBooted DiskImage.PC) @@ -144,8 +144,8 @@ type MountPoint = Maybe FilePath type PartSpec = (MountPoint, PartSize -> Partition) -- | Specifies a mounted partition using a given filesystem. -mountedPartition :: Fs -> FilePath -> PartSpec -mountedPartition fs mntpoint = (Just mntpoint, mkPartition fs) +mountedAt :: (PartSize -> Partition) -> FilePath -> PartSpec +mountedAt mkp mntpoint = (Just mntpoint, mkp) -- | Specifies a swap partition of a given size. swapPartition :: PartSize -> PartSpec |