diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-11-17 15:14:02 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-11-17 15:14:02 -0400 |
| commit | 1a837867b8ae264fee2b9bacc8fd2a86d0f78ec8 (patch) | |
| tree | bab422c65e7c8e93ad299351fe7a5a7c7bb39f43 /joeyconfig.hs | |
| parent | f9565ef960a321819fe0760a1277f17c087b5a18 (diff) | |
update initramfs and flash-kernel during disk image finalization
flashKernelMounted is slightly cargo culted from Grub.bootsMounted,
could be refactored.
This commit was sponsored by Thom May on Patreon.
Diffstat (limited to 'joeyconfig.hs')
| -rw-r--r-- | joeyconfig.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs index 0a018826..48eff2ec 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -6,6 +6,7 @@ import Propellor import Propellor.Property.Scheduled import Propellor.Property.DiskImage import Propellor.Property.Chroot +import Propellor.Property.Machine import qualified Propellor.Property.File as File import qualified Propellor.Property.Apt as Apt import qualified Propellor.Property.Network as Network @@ -24,7 +25,6 @@ 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.Machine as Machine import qualified Propellor.Property.Borg as Borg import qualified Propellor.Property.Gpg as Gpg import qualified Propellor.Property.Systemd as Systemd @@ -109,12 +109,12 @@ darkstar = host "darkstar.kitenet.net" $ props sheevaplug :: Host sheevaplug = host "sheevaplug.kitenet.net" $ props & osDebian Unstable ARMEL - & Machine.marvell_SheevaPlug Machine.Marvell_SheevaPlug_SDCard + & marvell_SheevaPlug Marvell_SheevaPlug_SDCard lime :: Host lime = host "lime.kitenet.net" $ props & osDebian Unstable ARMHF - & Machine.olimex_A10_OLinuXino_LIME + & olimex_A10_OLinuXino_LIME gnu :: Host gnu = host "gnu.kitenet.net" $ props @@ -200,7 +200,7 @@ honeybee = host "honeybee.kitenet.net" $ props -- and try to be robust. & "/etc/default/rcS" `File.containsLine` "FSCKFIX=yes" - & Machine.cubietech_Cubietruck + & cubietech_Cubietruck & Apt.installed ["firmware-brcm80211"] -- Workaround for https://bugs.debian.org/844056 `requires` File.hasPrivContent "/lib/firmware/brcm/brcmfmac43362-sdio.txt" anyContext |