summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-11-17 13:36:12 -0400
committerJoey Hess2017-11-17 13:36:12 -0400
commit04eaf8e8e5cdcababb3b783abe416821a91c8e8e (patch)
treee55b6d93d3eee3b9f947fb8781cd63321c3e05fa
parent40ad6baf2808fac851d9872df6217ca6393ec6c8 (diff)
propellor spin
-rw-r--r--joeyconfig.hs11
-rw-r--r--src/Propellor/Property/Machine.hs11
2 files changed, 15 insertions, 7 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index bffb0802..4b544064 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -95,14 +95,19 @@ darkstar = host "darkstar.kitenet.net" $ props
& Ssh.userKeys (User "joey") hostContext
[ (SshRsa, "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1YoyHxZwG5Eg0yiMTJLSWJ/+dMM6zZkZiR4JJ0iUfP+tT2bm/lxYompbSqBeiCq+PYcSC67mALxp1vfmdOV//LWlbXfotpxtyxbdTcQbHhdz4num9rJQz1tjsOsxTEheX5jKirFNC5OiKhqwIuNydKWDS9qHGqsKcZQ8p+n1g9Lr3nJVGY7eRRXzw/HopTpwmGmAmb9IXY6DC2k91KReRZAlOrk0287LaK3eCe1z0bu7LYzqqS+w99iXZ/Qs0m9OqAPnHZjWQQ0fN4xn5JQpZSJ7sqO38TBAimM+IHPmy2FTNVVn9zGM+vN1O2xr3l796QmaUG1+XLL0shfR/OZbb joey@darkstar")
]
- & imageBuilt (RawDiskImage "/srv/test.img")
- (hostChroot lime (Debootstrapped mempty))
+ & imageBuilt (RawDiskImage "/srv/sheevaplug.img")
+ (hostChroot sheevaplug (Debootstrapped mempty))
MSDOS
[ partition EXT4
`mountedAt` "/"
- `setSize` MegaBytes 4096
+ `setSize` MegaBytes 1024
]
+sheevaplug :: Host
+sheevaplug = host "sheevaplug.kitenet.net" $ props
+ & osDebian Unstable ARMEL
+ & Machine.marvell_SheevaPlug Machine.Marvell_SheevaPlug_SDCard
+
lime :: Host
lime = host "lime.kitenet.net" $ props
& osDebian Unstable ARMHF
diff --git a/src/Propellor/Property/Machine.hs b/src/Propellor/Property/Machine.hs
index a351ca80..afffe143 100644
--- a/src/Propellor/Property/Machine.hs
+++ b/src/Propellor/Property/Machine.hs
@@ -28,7 +28,9 @@ import qualified Propellor.Property.Apt as Apt
import qualified Propellor.Property.FlashKernel as FlashKernel
import qualified Propellor.Property.Uboot as Uboot
-data Marvell_SheevaPlug_BootDevice = SDCard | ESATA
+data Marvell_SheevaPlug_BootDevice
+ = Marvell_SheevaPlug_SDCard
+ | Marvell_SheevaPlug_ESATA
-- | Marvel SheevaPlug
--
@@ -36,10 +38,11 @@ data Marvell_SheevaPlug_BootDevice = SDCard | ESATA
-- configured to boot from the SD card or eSATA. See
-- https://www.cyrius.com/debian/kirkwood/sheevaplug/install/
marvell_SheevaPlug :: Marvell_SheevaPlug_BootDevice -> Property (HasInfo + DebianLike)
-marvell_SheevaPlug bd = case bd of
- SDCard -> FlashKernel.installed "Marvell SheevaPlug Reference Board"
+marvell_SheevaPlug Marvell_SheevaPlug_SDCard =
+ FlashKernel.installed "Marvell SheevaPlug Reference Board"
`requires` kirkwood
- ESATA -> FlashKernel.installed "Marvell eSATA SheevaPlug Reference Board"
+marvell_SheevaPlug Marvell_SheevaPlug_ESATA =
+ FlashKernel.installed "Marvell eSATA SheevaPlug Reference Board"
`requires` kirkwood
-- | Cubietech Cubietruck (untested)