summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--joeyconfig.hs5
-rw-r--r--src/Propellor/Property/Machine.hs20
2 files changed, 12 insertions, 13 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 31570f45..ba2e9c59 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -24,7 +24,7 @@ import qualified Propellor.Property.Postfix as Postfix
import qualified Propellor.Property.Apache as Apache
import qualified Propellor.Property.LetsEncrypt as LetsEncrypt
import qualified Propellor.Property.Grub as Grub
-import qualified Propellor.Property.FlashKernel as FlashKernel
+import qualified Propellor.Property.Machine as Machine
import qualified Propellor.Property.Borg as Borg
import qualified Propellor.Property.Gpg as Gpg
import qualified Propellor.Property.Systemd as Systemd
@@ -103,8 +103,7 @@ darkstar = host "darkstar.kitenet.net" $ props
where
mychroot d = debootstrapped mempty d $ props
& osDebian Unstable ARMHF
- & Apt.installed ["linux-image-armmp", "u-boot"]
- & FlashKernel.installed "Olimex A10-OLinuXino-LIME"
+ & Machine.Olimex_A10_OLinuXino_LIME
gnu :: Host
gnu = host "gnu.kitenet.net" $ props
diff --git a/src/Propellor/Property/Machine.hs b/src/Propellor/Property/Machine.hs
index 61a77492..e193c4a2 100644
--- a/src/Propellor/Property/Machine.hs
+++ b/src/Propellor/Property/Machine.hs
@@ -2,27 +2,27 @@
--
-- Many embedded computers have their own special configuration needed
-- to use them. Rather than needing to hunt down documentation about the
--- kernel, bootloader, etc needed by a given board, if there's a property
--- in here for your board, you can simply use it.
+-- kernel, bootloader, etc needed by a given machine, if there's a property
+-- in here for your machine, you can simply use it.
module Propellor.Property.Machine (
-- * ARM boards
- Olimex_A10_OLinuXino_LIME,
- Cubietech Cubietruck
+ Cubietech Cubietruck,
+ Olimex_A10_OLinuXino_LIME
)
--- | Olimex A10-OLinuXino-LIME
-Olimex_A10_OLinuXino_LIME :: Property (HasInfo + DebianLike)
-Olimex_A10_OLinuXino_LIME = FlashKernel.installed "Olimex A10-OLinuXino-LIME"
- `requires` sunixi
- `requires` armmp
-
-- | Cubietech Cubietruck
Cubietech_Cubietruck :: Property (HasInfo + DebianLike)
Cubietech_Cubietruck = FlashKernel.installed "Cubietech Cubietruck"
`requires` sunixi
`requires` lpae
+-- | Olimex A10-OLinuXino-LIME
+Olimex_A10_OLinuXino_LIME :: Property (HasInfo + DebianLike)
+Olimex_A10_OLinuXino_LIME = FlashKernel.installed "Olimex A10-OLinuXino-LIME"
+ `requires` sunixi
+ `requires` armmp
+
sunixi :: Property DebianLike
sunixi = Apt.installed
[ "firmware-linux-free"