implement "apt-update" to install apt lists

presently this hard-codes stretch & amd64

2 files changed, 18 insertions, 2 deletions

diff --git a/fsmgr.hs b/fsmgr.hs
index 65797c4..2a2d09c 100644
--- a/fsmgr.hs
+++ b/fsmgr.hs
@@ -53,6 +53,19 @@ uname = unsafePerformIO $ do
   Stdout out <- cmd "uname -r"
   return $ last . wordsBy '-' . head . lines $ out
 
+aptListFiles :: [FilePath]
+aptListFiles = ("/var/lib/apt/lists" </>) <$> observedCorrectListForStretch
+  where
+    observedCorrectListForStretch =
+      [ "httpredir.debian.org_debian_dists_stretch_main_binary-amd64_Packages"
+      , "httpredir.debian.org_debian_dists_stretch_main_i18n_Translation-en"
+      , "httpredir.debian.org_debian_dists_stretch_Release"
+      , "httpredir.debian.org_debian_dists_stretch_Release.gpg"
+      , "security.debian.org_dists_stretch_updates_InRelease"
+      , "security.debian.org_dists_stretch_updates_main_binary-amd64_Packages"
+      , "security.debian.org_dists_stretch_updates_main_i18n_Translation-en"
+      ]
+
 buildRoot :: DiskImageConfig -> FilePath -> Action ()
 buildRoot config@DiskImageConfig{..} finalOut = do
   let out        = finalOut <.> "tmp"
@@ -81,7 +94,8 @@ buildRoot config@DiskImageConfig{..} finalOut = do
       cmd_ (AddEnv "DEBIAN_FRONTEND" "noninteractive")
            ["dpkg"] [if unpackOnly then "--unpack" else "--install"] (dynamicNames <$> debs)
     {- 2.5. install apt package cache -}
-    -- TODO
+    when installAptLists $ do
+      cmd_ "rsync -Ra" (("/./" ++) <$> aptListFiles) (mountpoint ++ "/")
     {- 3. binaries -}
     let go b = do
           p <- fromMaybe (fail $ "not found in ${PATH}: " ++ b) <$> liftIO (pathLocate b)
diff --git a/src/ConfigFile.hs b/src/ConfigFile.hs
index 08aa914..a5b5989 100644
--- a/src/ConfigFile.hs
+++ b/src/ConfigFile.hs
@@ -62,6 +62,7 @@ data DiskImageConfig = DiskImageConfig {
 , skelFiles         :: Vector Text
 , optionalSkelFiles :: Vector Text
 , newSeededImgSize  :: Maybe Int64
+, installAptLists   :: Bool
 } deriving (Show, Read)
 
 parsePackageName :: Text -> Package
@@ -80,9 +81,10 @@ diskImageConfigParser = object $
   <*> defaultField "skel-files" Vector.empty (array string)
   <*> defaultField "skel-files-optional" Vector.empty (array string)
   <*> optField "seedme" integer
+  <*> 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