From d21fc297344f639362e89b9746f7570858b037ca Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Mon, 10 Jan 2022 20:49:36 -0500 Subject: new fsmgr .yaml config directive: "files" --- src/ConfigFile.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') 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 { , unitFiles :: Vector Text , binaries :: Vector Text , optionalBinaries :: Vector Text +, dataFiles :: Vector Text , chrootCommands :: Vector Text , skelFiles :: Vector Text , optionalSkelFiles :: Vector Text @@ -79,6 +80,7 @@ diskImageConfigParser = object $ <*> defaultField "unit-files" Vector.empty (array string) <*> defaultField "binaries" Vector.empty (array string) <*> defaultField "binaries-optional" Vector.empty (array string) + <*> defaultField "files" Vector.empty (array string) <*> defaultField "chroot-commands" Vector.empty (array string) <*> defaultField "skel-files" Vector.empty (array string) <*> defaultField "skel-files-optional" Vector.empty (array string) @@ -86,7 +88,7 @@ diskImageConfigParser = object $ <*> defaultField "apt-update" False bool convSeeded :: DiskImageConfig -> DiskImageConfig -convSeeded x@(DiskImageConfig (ParentImageConfigFile f) _ _ _ _ _ _ _ _ _ (Just size) _) = x { initialImage = SeededImage size f } +convSeeded x@(DiskImageConfig (ParentImageConfigFile f) _ _ _ _ _ _ _ _ _ _ (Just size) _) = x { initialImage = SeededImage size f } convSeeded x = x readCfg :: FilePath -> Action DiskImageConfig -- cgit v1.2.3