summaryrefslogtreecommitdiff
path: root/src/ConfigFile.hs
diff options
context:
space:
mode:
Diffstat (limited to 'src/ConfigFile.hs')
-rw-r--r--src/ConfigFile.hs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ConfigFile.hs b/src/ConfigFile.hs
index d7fe60d..7ba2439 100644
--- a/src/ConfigFile.hs
+++ b/src/ConfigFile.hs
@@ -59,6 +59,7 @@ data DiskImageConfig = DiskImageConfig {
59, unitFiles :: Vector Text 59, unitFiles :: Vector Text
60, binaries :: Vector Text 60, binaries :: Vector Text
61, optionalBinaries :: Vector Text 61, optionalBinaries :: Vector Text
62, dataFiles :: Vector Text
62, chrootCommands :: Vector Text 63, chrootCommands :: Vector Text
63, skelFiles :: Vector Text 64, skelFiles :: Vector Text
64, optionalSkelFiles :: Vector Text 65, optionalSkelFiles :: Vector Text
@@ -79,6 +80,7 @@ diskImageConfigParser = object $
79 <*> defaultField "unit-files" Vector.empty (array string) 80 <*> defaultField "unit-files" Vector.empty (array string)
80 <*> defaultField "binaries" Vector.empty (array string) 81 <*> defaultField "binaries" Vector.empty (array string)
81 <*> defaultField "binaries-optional" Vector.empty (array string) 82 <*> defaultField "binaries-optional" Vector.empty (array string)
83 <*> defaultField "files" Vector.empty (array string)
82 <*> defaultField "chroot-commands" Vector.empty (array string) 84 <*> defaultField "chroot-commands" Vector.empty (array string)
83 <*> defaultField "skel-files" Vector.empty (array string) 85 <*> defaultField "skel-files" Vector.empty (array string)
84 <*> defaultField "skel-files-optional" Vector.empty (array string) 86 <*> defaultField "skel-files-optional" Vector.empty (array string)
@@ -86,7 +88,7 @@ diskImageConfigParser = object $
86 <*> defaultField "apt-update" False bool 88 <*> defaultField "apt-update" False bool
87 89
88convSeeded :: DiskImageConfig -> DiskImageConfig 90convSeeded :: DiskImageConfig -> DiskImageConfig
89convSeeded x@(DiskImageConfig (ParentImageConfigFile f) _ _ _ _ _ _ _ _ _ (Just size) _) = x { initialImage = SeededImage size f } 91convSeeded x@(DiskImageConfig (ParentImageConfigFile f) _ _ _ _ _ _ _ _ _ _ (Just size) _) = x { initialImage = SeededImage size f }
90convSeeded x = x 92convSeeded x = x
91 93
92readCfg :: FilePath -> Action DiskImageConfig 94readCfg :: FilePath -> Action DiskImageConfig