Merge commit 'db4130d'

3 files changed, 11 insertions, 1 deletions

diff --git a/btrfs-shrink b/btrfs-shrink
index 12f0e8e..26c1365 100755
--- a/btrfs-shrink
+++ b/btrfs-shrink
@@ -61,6 +61,7 @@ main()
         truncate=
         mountpoint="$1".mnt.tmp
         mkdir -p "$mountpoint"
+        btrfs dev scan -u
         mount -t btrfs "$1" "$mountpoint"
         result=$?
 
diff --git a/fsmgr.hs b/fsmgr.hs
index dbde290..2ee7c7c 100644
--- a/fsmgr.hs
+++ b/fsmgr.hs
@@ -175,6 +175,13 @@ buildRoot config@DiskImageConfig{..} finalOut = do
       in do
         forM_ (unpack <$> binaries) go
         forM_ (unpack <$> optionalBinaries) $ ignoreErrors . go
+    {- 3.2 data files -}
+    let go b = do
+          need [b]
+          target <- absPath mountpoint
+          putQuiet $ show (target, b)
+          cmd_ "cp -L" [b] [target ++ b]
+      in forM_ (unpack <$> dataFiles) go
     {- 3.5 skel -}
     let go f = when (not $ null f) $ do
           homeDir <- getHomeDir
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