From d7ec2209b108e8e5427fd8c16aef213a8e5acb03 Mon Sep 17 00:00:00 2001
From: David Gageot <david.gageot@docker.com>
Date: Fri, 7 Oct 2022 18:46:38 +0200
Subject: [PATCH] Remove dead code

Signed-off-by: David Gageot <david.gageot@docker.com>
---
 src/cmd/linuxkit/cache/nopcloserwriter.go | 22 --------------------
 src/cmd/linuxkit/initrd/initrd.go         | 25 -----------------------
 src/cmd/linuxkit/moby/output.go           | 12 -----------
 3 files changed, 59 deletions(-)
 delete mode 100644 src/cmd/linuxkit/cache/nopcloserwriter.go

diff --git a/src/cmd/linuxkit/cache/nopcloserwriter.go b/src/cmd/linuxkit/cache/nopcloserwriter.go
deleted file mode 100644
index c0f842266..000000000
--- a/src/cmd/linuxkit/cache/nopcloserwriter.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package cache
-
-import (
-	"io"
-)
-
-type nopCloserWriter struct {
-	writer io.Writer
-}
-
-func (n nopCloserWriter) Write(b []byte) (int, error) {
-	return n.writer.Write(b)
-}
-
-func (n nopCloserWriter) Close() error {
-	return nil
-}
-
-// NopCloserWriter wrap an io.Writer with a no-op Closer
-func NopCloserWriter(writer io.Writer) io.WriteCloser {
-	return nopCloserWriter{writer}
-}
diff --git a/src/cmd/linuxkit/initrd/initrd.go b/src/cmd/linuxkit/initrd/initrd.go
index 480066796..93fac03ce 100644
--- a/src/cmd/linuxkit/initrd/initrd.go
+++ b/src/cmd/linuxkit/initrd/initrd.go
@@ -94,24 +94,6 @@ func copyTarEntry(w *Writer, thdr *tar.Header, r io.Reader) (written int64, err
 	return
 }
 
-// CopyTar copies a tar stream into an initrd
-func CopyTar(w *Writer, r *tar.Reader) (written int64, err error) {
-	for {
-		var thdr *tar.Header
-		thdr, err = r.Next()
-		if err == io.EOF {
-			return written, nil
-		}
-		if err != nil {
-			return
-		}
-		written, err = copyTarEntry(w, thdr, r)
-		if err != nil {
-			return
-		}
-	}
-}
-
 // CopySplitTar copies a tar stream into an initrd, but splits out kernel, cmdline, and ucode
 func CopySplitTar(w *Writer, r *tar.Reader) (kernel []byte, cmdline string, ucode []byte, err error) {
 	for {
@@ -188,10 +170,3 @@ func (w *Writer) Close() error {
 	}
 	return nil
 }
-
-// Copy reads a tarball in a stream and outputs a compressed init ram disk
-func Copy(w *Writer, r io.Reader) (int64, error) {
-	tr := tar.NewReader(r)
-
-	return CopyTar(w, tr)
-}
diff --git a/src/cmd/linuxkit/moby/output.go b/src/cmd/linuxkit/moby/output.go
index 380abec57..e860144fa 100644
--- a/src/cmd/linuxkit/moby/output.go
+++ b/src/cmd/linuxkit/moby/output.go
@@ -24,18 +24,6 @@ import (
 var imagesBytes []byte
 var outputImages map[string]string
 
-// UpdateOutputImages overwrite the docker images used to build the outputs
-// 'update' is a map where the key is the output format and the value is a LinuxKit 'mkimage' image.
-func UpdateOutputImages(update map[string]string) error {
-	for k, img := range update {
-		if _, ok := outputImages[k]; !ok {
-			return fmt.Errorf("Image format %s is not known", k)
-		}
-		outputImages[k] = img
-	}
-	return nil
-}
-
 var outFuns = map[string]func(string, io.Reader, int) error{
 	"kernel+initrd": func(base string, image io.Reader, size int) error {
 		kernel, initrd, cmdline, ucode, err := tarToInitrd(image)