diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-07-05 20:58:03 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-07-05 20:59:39 -0400 |
| commit | 7e9dc8880fc18d9dbaef039b3fc81db40cbdf9a9 (patch) | |
| tree | 970cf241568a4590b774de7dfc2d5978741e4be1 /src | |
| parent | 774c45caf286f8138fde92ac7bad771c39f72269 (diff) | |
fix chroot info access
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/Chroot.hs | 1 | ||||
| -rw-r--r-- | src/Propellor/Property/DiskImage.hs | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs index d3bd7e5c..65749e34 100644 --- a/src/Propellor/Property/Chroot.hs +++ b/src/Propellor/Property/Chroot.hs @@ -15,7 +15,6 @@ module Propellor.Property.Chroot ( -- * Internal use provisioned', propagateChrootInfo, - chrootInfo, propellChroot, chain, chrootSystem, diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs index 10679751..9300b201 100644 --- a/src/Propellor/Property/DiskImage.hs +++ b/src/Propellor/Property/DiskImage.hs @@ -18,7 +18,7 @@ module Propellor.Property.DiskImage ( import Propellor.Base import Propellor.Property.DiskImage.PartSpec -import Propellor.Property.Chroot (Chroot, chrootInfo) +import Propellor.Property.Chroot (Chroot) import Propellor.Property.Chroot.Util (removeChroot) import qualified Propellor.Property.Chroot as Chroot import qualified Propellor.Property.Grub as Grub @@ -145,7 +145,7 @@ imageBuilt' rebuild img mkchroot tabletype partspec = Chroot.Chroot d b (\c _ -> ip c onlyPrivData) h -- Pick boot loader finalization based on which bootloader is -- installed. - final = case fromInfo (chrootInfo chroot) of + final = case fromInfo (containerInfo chroot) of [GrubInstalled] -> grubBooted [] -> unbootable "no bootloader is installed" _ -> unbootable "multiple bootloaders are installed; don't know which to use" |