diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-10-23 01:27:51 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-10-23 01:27:51 -0400 |
| commit | eca865628c2cae8996854d596dfee0dea4ef17c2 (patch) | |
| tree | d30425bf0630173bc17be40c5ca8283b2a3897f6 /config-joey.hs | |
| parent | bf25cb287bcec0b85f64c90a88a4556291efe74a (diff) | |
| parent | 1a55d09b5452f07508d4624b632e9a54782dbee8 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'config-joey.hs')
| -rw-r--r-- | config-joey.hs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/config-joey.hs b/config-joey.hs index 7d0f3c05..21d7194f 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -81,11 +81,12 @@ darkstar = host "darkstar.kitenet.net" & JoeySites.postfixClientRelay (Context "darkstar.kitenet.net") & JoeySites.dkimMilter - & imageBuilt "/tmp/img" c MSDOS - [ partition EXT2 `mountedAt` "/boot" `setFlag` BootFlag - , partition EXT4 `mountedAt` "/" `addFreeSpace` MegaBytes 100 - -- , swapPartition (MegaBytes 256) - ] noFinalization -- (grubBooted PC) + & imageBuilt "/tmp/img" c MSDOS (grubBooted PC) + [ partition EXT4 `mountedAt` "/" + `addFreeSpace` MegaBytes 100 + `setFlag` BootFlag + , swapPartition (MegaBytes 256) + ] where c d = Chroot.debootstrapped (System (Debian Unstable) "amd64") mempty d & Apt.installed ["linux-image-amd64"] |