diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2017-11-19 18:19:11 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2017-11-19 18:19:11 -0700 |
| commit | 31852d8699c73238b4ede70307c6cd5b81519e6c (patch) | |
| tree | 203d47f0e4d1efb40a5ef9023058bba7652285e1 /joeyconfig.hs | |
| parent | 09b92db54d800ce0f94fa0ab4c657446758d5274 (diff) | |
| parent | bacb87f2203842c3014e55f7f19c6b408b475ca4 (diff) | |
Merge branch 'master' of https://git.joeyh.name/git/propellor into sbuild-overhaul
Diffstat (limited to 'joeyconfig.hs')
| -rw-r--r-- | joeyconfig.hs | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs index 20a34ba9..d39b7ed8 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -97,16 +97,9 @@ 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/honeybee.img") - (hostChroot honeybee (Debootstrapped mempty)) - MSDOS - [ partition EXT2 - `mountedAt` "/boot" - `setSize` MegaBytes 200 - , partition EXT4 - `mountedAt` "/" - `addFreeSpace` MegaBytes 500 - ] + & imageBuiltFor honeybee + (RawDiskImage "/srv/honeybee.img") + (Debootstrapped mempty) gnu :: Host gnu = host "gnu.kitenet.net" $ props @@ -189,6 +182,18 @@ honeybee = host "honeybee.kitenet.net" $ props [ "Home router and arm git-annex build box." ] & cubietech_Cubietruck + & hasPartition + ( partition EXT2 + `mountedAt` "/boot" + `partLocation` Beginning + `setSize` MegaBytes 200 + ) + & hasPartition + ( partition EXT4 + `mountedAt` "/" + `addFreeSpace` MegaBytes 500 + ) + & Apt.installed ["firmware-brcm80211"] -- Workaround for https://bugs.debian.org/844056 `requires` File.hasPrivContent "/lib/firmware/brcm/brcmfmac43362-sdio.txt" anyContext |