summaryrefslogtreecommitdiff
path: root/joeyconfig.hs
diff options
context:
space:
mode:
authorJoey Hess2019-01-18 12:08:34 -0400
committerJoey Hess2019-01-18 12:08:34 -0400
commit876458adbc41a94c06d68b70e8b7b27288479592 (patch)
treea04d307b7d6eb0644f51af12285742f9b2f726d5 /joeyconfig.hs
parent80af78c2bbbc1684a1085225b5754f4fcda4cbcb (diff)
parentf42a71ab2653707be4fcdaf1ce0f9fff209d8f12 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'joeyconfig.hs')
-rw-r--r--joeyconfig.hs6
1 files changed, 1 insertions, 5 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index e893917f..d22c393c 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -185,11 +185,7 @@ honeybee = host "honeybee.kitenet.net" $ props
)
& JoeySites.cubieTruckOneWire
- & Apt.installed ["firmware-misc-nonfree"]
- & Apt.installed ["firmware-brcm80211"]
- -- Workaround for https://bugs.debian.org/844056
- `requires` File.hasPrivContent "/lib/firmware/brcm/brcmfmac43362-sdio.txt" anyContext
- `requires` File.dirExists "/lib/firmware/brcm"
+ & Apt.installed ["firmware-atheros"]
& Apt.serviceInstalledRunning "ntp" -- no hardware clock
& bootstrappedFrom GitRepoOutsideChroot
& Ssh.hostKeys hostContext