Browse code

Revert "Add -S option to tar for efficient sparse file handling"

This reverts commit 733bf5d3ddbfb6dba7c2c0996c4af47a765e4593.

This is needed to fix "no such file" errors `docker build` errors for
devicemapper.

This fixes issue #3449.

Docker-DCO-1.0-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

unclejack authored on 2014/01/08 07:54:42
Showing 2 changed files
... ...
@@ -48,7 +48,6 @@ Daniel YC Lin <dlin.tw@gmail.com>
48 48
 Darren Coxall <darren@darrencoxall.com>
49 49
 David Calavera <david.calavera@gmail.com>
50 50
 David Sissitka <me@dsissitka.com>
51
-Dinesh Subhraveti <dineshs@altiscale.com>
52 51
 Deni Bertovic <deni@kset.org>
53 52
 Dominik Honnef <dominik@honnef.co>
54 53
 Don Spaulding <donspauldingii@gmail.com>
... ...
@@ -149,7 +149,7 @@ func escapeName(name string) string {
149 149
 // Tar creates an archive from the directory at `path`, only including files whose relative
150 150
 // paths are included in `filter`. If `filter` is nil, then all files are included.
151 151
 func TarFilter(path string, options *TarOptions) (io.Reader, error) {
152
-	args := []string{"tar", "-S", "--numeric-owner", "-f", "-", "-C", path, "-T", "-"}
152
+	args := []string{"tar", "--numeric-owner", "-f", "-", "-C", path, "-T", "-"}
153 153
 	if options.Includes == nil {
154 154
 		options.Includes = []string{"."}
155 155
 	}
... ...
@@ -228,7 +228,7 @@ func Untar(archive io.Reader, path string, options *TarOptions) error {
228 228
 	compression := DetectCompression(buf)
229 229
 
230 230
 	utils.Debugf("Archive compression detected: %s", compression.Extension())
231
-	args := []string{"-S", "--numeric-owner", "-f", "-", "-C", path, "-x" + compression.Flag()}
231
+	args := []string{"--numeric-owner", "-f", "-", "-C", path, "-x" + compression.Flag()}
232 232
 
233 233
 	if options != nil {
234 234
 		for _, exclude := range options.Excludes {