From 2bd623a61c7404e196759af1f6426372747aa07f Mon Sep 17 00:00:00 2001
From: Ettore Di Giacinto <mudler@sabayon.org>
Date: Tue, 4 Jan 2022 16:56:08 +0100
Subject: [PATCH] :wrench: Drop containerd workaround

Partly reverts
https://github.com/mudler/luet/commit/37cc186c0b4daf1a5ce3f761ad7afa93fabf9d49,
but re-enable test.
---
 pkg/api/core/image/delta_test.go | 3 +++
 pkg/api/core/image/extract.go    | 7 +------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkg/api/core/image/delta_test.go b/pkg/api/core/image/delta_test.go
index f205783b..522e5972 100644
--- a/pkg/api/core/image/delta_test.go
+++ b/pkg/api/core/image/delta_test.go
@@ -78,6 +78,9 @@ var _ = Describe("Delta", func() {
 				)
 				Expect(err).ToNot(HaveOccurred())
 				defer os.RemoveAll(tmpdir) // clean up
+
+				// No extra dirs are present
+				Expect(file.Exists(filepath.Join(tmpdir, "home"))).To(BeFalse())
 				// Cache from go
 				Expect(file.Exists(filepath.Join(tmpdir, "root", ".cache"))).To(BeTrue())
 				// sh is present from alpine, hence not in the result
diff --git a/pkg/api/core/image/extract.go b/pkg/api/core/image/extract.go
index cbfc7425..813a5a24 100644
--- a/pkg/api/core/image/extract.go
+++ b/pkg/api/core/image/extract.go
@@ -65,12 +65,7 @@ func ExtractDeltaAdditionsFiles(
 			return nil, err
 		}
 
-		switch hdr.Typeflag {
-		case tar.TypeDir:
-			filesSrc.Set(filepath.Dir(hdr.Name), "")
-		default:
-			filesSrc.Set(hdr.Name, "")
-		}
+		filesSrc.Set(hdr.Name, "")
 	}
 
 	return func(h *tar.Header) (bool, error) {