From 15073fd5fc812941e2ab2d39d5950106fb3b7a98 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 17 Nov 2017 19:18:39 -0400 Subject: fixed for bootstrapping honeybee from chroot Install dnsmasq first to avoid connfile conflict Don't set up container when in chroot, won't work. Propellor should perhaps prevent this.. --- joeyconfig.hs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'joeyconfig.hs') diff --git a/joeyconfig.hs b/joeyconfig.hs index f241cf3c..e1046081 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -203,11 +203,13 @@ honeybee = host "honeybee.kitenet.net" $ props & Apt.installed ["mtr-tiny", "iftop", "screen"] & Postfix.satellite - & Systemd.nspawned (GitAnnexBuilder.autoBuilderContainer - GitAnnexBuilder.armAutoBuilder - Unstable ARMEL Nothing (Cron.Times "15 10 * * *") "10h") + & check (not <$> inChroot) (setupRevertableProperty autobuilder) -- In case compiler needs more than available ram & Apt.serviceInstalledRunning "swapspace" + where + autobuilder = Systemd.nspawned (GitAnnexBuilder.autoBuilderContainer + GitAnnexBuilder.armAutoBuilder + Unstable ARMEL Nothing (Cron.Times "15 10 * * *") "10h") -- This is not a complete description of kite, since it's a -- multiuser system with eg, user passwords that are not deployed -- cgit v1.2.3