diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-09-02 11:58:06 -0700 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-09-02 11:58:06 -0700 |
| commit | b08e5f6ebed4f8ae429876c4f01f31000562ab66 (patch) | |
| tree | dcaa7b3be091ba0182773f8c042101fa1bdd3149 | |
| parent | ed42227b115ed1adf2e88b57bad8a7744d9cb240 (diff) | |
propellor spin
| -rw-r--r-- | config-joey.hs | 2 | ||||
| -rw-r--r-- | src/Propellor/Property/DiskImage.hs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config-joey.hs b/config-joey.hs index b3769db3..276817f2 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -84,7 +84,7 @@ darkstar = host "darkstar.kitenet.net" & DiskImage.built "/tmp/img" c ps (DiskImage.grubBooted DiskImage.PC) where c d = Chroot.debootstrapped (System (Debian Unstable) "amd64") mempty d - & Apt.installed ["openssh-server"] + & Apt.installed ["linux-image-amd64"] ps = DiskImage.fitChrootSize MSDOS [ EXT2 `DiskImage.mountedPartition` "/boot" , EXT4 `DiskImage.mountedPartition` "/" diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs index 5cef449b..b31aef45 100644 --- a/src/Propellor/Property/DiskImage.hs +++ b/src/Propellor/Property/DiskImage.hs @@ -42,7 +42,7 @@ import System.Posix.Files -- > import Propellor.Property.Parted -- -- > let chroot d = Chroot.debootstrapped (System (Debian Unstable) "amd64") mempty d --- > & Apt.installed ["openssh-server"] +-- > & Apt.installed ["linux-image-amd64"] -- > & ... -- > partitions = DiskImage.fitChrootSize MSDOS -- > [ EXT2 `DiskImage.mountedPartition` "/boot" @@ -81,7 +81,7 @@ built' rebuild img mkchroot mkparttable final = <$> dirSizes chrootdir -- tie the knot! let (mnts, t) = mkparttable (map (getMountSz szm) mnts) - liftIO $ print (mnts, t, map (getMountSz szm) mnts, szm) + liftIO $ print (mnts, t, map (getMountSz szm) mnts) ensureProperty $ exists img (partTableSize t) `before` |