use tar pointer config

briandowns · May 9, 2019 · 869d168 · 869d168
1 parent fc9eabf
commit 869d168
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/jail/base.go b/jail/base.go
@@ -59,7 +59,12 @@ func (j *jailService) extractBasePkgs() error {
 	t := j.metrics.NewTiming()
 	defer t.Send("base.extract_packages_time")
 	fullPath := j.conf.Jails.BaseJailDir + "/releases/" + j.conf.Release
-	txz := &archiver.TarXz{}
+	txz := archiver.TarXz{
+		Tar: &archiver.Tar{
+			MkdirAll:          true,
+			OverwriteExisting: true,
+		},
+	}
 	for _, p := range basePackages {
 		if err := txz.Unarchive("/tmp/"+j.conf.Release+"/"+p, fullPath); err != nil {
 			return err
@@ -185,7 +190,12 @@ func (j *jailService) installGo() error {
 	}
 	src := fmt.Sprintf("/tmp/go%s.freebsd-amd64.tar.gz", j.conf.GoVersion)
 	dst := fmt.Sprintf("%s/releases/%s/usr/local", j.conf.Jails.BaseJailDir, j.conf.Release)
-	tgz := &archiver.TarGz{}
+	tgz := archiver.TarGz{
+		Tar: &archiver.Tar{
+			MkdirAll:          true,
+			OverwriteExisting: true,
+		},
+	}
 	if err := tgz.Unarchive(src, dst); err != nil {
 		return err
 	}