Merge pull request #3190 from s1gnate-sync/master

AkihiroSuda · web-flow · commit d91ddd73415f · 2025-02-05T08:03:25.000+09:00
Update go-diskfs package to 1.5.0
diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.6
 	github.com/cyphar/filepath-securejoin v0.4.1
 	github.com/digitalocean/go-qemu v0.0.0-20221209210016-f035778c97f7
-	github.com/diskfs/go-diskfs v1.4.1
+	github.com/diskfs/go-diskfs v1.5.0
 	github.com/docker/go-units v0.5.0
 	github.com/elastic/go-libaudit/v2 v2.6.1
 	github.com/foxcpp/go-mockdns v1.1.0
diff --git a/go.sum b/go.sum
@@ -64,8 +64,8 @@ github.com/digitalocean/go-qemu v0.0.0-20221209210016-f035778c97f7 h1:3OVJAbR131
 github.com/digitalocean/go-qemu v0.0.0-20221209210016-f035778c97f7/go.mod h1:K4+o74YGNjOb9N6yyG+LPj1NjHtk+Qz0IYQPvirbaLs=
 github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U=
 github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
-github.com/diskfs/go-diskfs v1.4.1 h1:iODgkzHLmvXS+1VDztpW53T+dQm8GQzi20y9yUd5UCA=
-github.com/diskfs/go-diskfs v1.4.1/go.mod h1:+tOkQs8CMMog6Nvljg8DGIxEXrgL48iyT3OM3IlSz74=
+github.com/diskfs/go-diskfs v1.5.0 h1:0SANkrab4ifiZBytk380gIesYh5Gc+3i40l7qsrYP4s=
+github.com/diskfs/go-diskfs v1.5.0/go.mod h1:bRFumZeGFCO8C2KNswrQeuj2m1WCVr4Ms5IjWMczMDk=
 github.com/djherbis/times v1.6.0 h1:w2ctJ92J8fBvWPxugmXIv7Nz7Q3iDMKNx9v5ocVH20c=
 github.com/djherbis/times v1.6.0/go.mod h1:gOHeRAz2h+VJNZ5Gmc/o7iD9k4wW7NMVqieYCY99oc0=
 github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
diff --git a/pkg/iso9660util/iso9660util.go b/pkg/iso9660util/iso9660util.go
@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 	"runtime"
 
+	"github.com/diskfs/go-diskfs/backend/file"
 	"github.com/diskfs/go-diskfs/filesystem"
 	"github.com/diskfs/go-diskfs/filesystem/iso9660"
 	"github.com/sirupsen/logrus"
@@ -27,6 +28,7 @@ func Write(isoPath, label string, layout []Entry) error {
 		return err
 	}
 
+	backendFile := file.New(isoFile, false)
 	defer isoFile.Close()
 
 	workdir, err := os.MkdirTemp("", "diskfs_iso")
@@ -39,7 +41,7 @@ func Write(isoPath, label string, layout []Entry) error {
 	}
 	logrus.Debugf("Creating iso file %s", isoFile.Name())
 	logrus.Debugf("Using %s as workspace", workdir)
-	fs, err := iso9660.Create(isoFile, 0, 0, 0, workdir)
+	fs, err := iso9660.Create(backendFile, 0, 0, 0, workdir)
 	if err != nil {
 		return err
 	}
@@ -81,11 +83,12 @@ func IsISO9660(imagePath string) (bool, error) {
 		return false, err
 	}
 	defer imageFile.Close()
+	backendFile := file.New(imageFile, true)
 
 	fileInfo, err := imageFile.Stat()
 	if err != nil {
 		return false, err
 	}
-	_, err = iso9660.Read(imageFile, fileInfo.Size(), 0, 0)
+	_, err = iso9660.Read(backendFile, fileInfo.Size(), 0, 0)
 	return err == nil, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`	`"path/filepath"`
`8`	`8`	`"runtime"`
`9`	`9`
	`10`	`+ "github.com/diskfs/go-diskfs/backend/file"`
`10`	`11`	`"github.com/diskfs/go-diskfs/filesystem"`
`11`	`12`	`"github.com/diskfs/go-diskfs/filesystem/iso9660"`
`12`	`13`	`"github.com/sirupsen/logrus"`
`@@ -27,6 +28,7 @@ func Write(isoPath, label string, layout []Entry) error {`
`27`	`28`	`return err`
`28`	`29`	`}`
`29`	`30`
	`31`	`+ backendFile := file.New(isoFile, false)`
`30`	`32`	`defer isoFile.Close()`
`31`	`33`
`32`	`34`	`workdir, err := os.MkdirTemp("", "diskfs_iso")`
`@@ -39,7 +41,7 @@ func Write(isoPath, label string, layout []Entry) error {`
`39`	`41`	`}`
`40`	`42`	`logrus.Debugf("Creating iso file %s", isoFile.Name())`
`41`	`43`	`logrus.Debugf("Using %s as workspace", workdir)`
`42`		`- fs, err := iso9660.Create(isoFile, 0, 0, 0, workdir)`
	`44`	`+ fs, err := iso9660.Create(backendFile, 0, 0, 0, workdir)`
`43`	`45`	`if err != nil {`
`44`	`46`	`return err`
`45`	`47`	`}`
`@@ -81,11 +83,12 @@ func IsISO9660(imagePath string) (bool, error) {`
`81`	`83`	`return false, err`
`82`	`84`	`}`
`83`	`85`	`defer imageFile.Close()`
	`86`	`+ backendFile := file.New(imageFile, true)`
`84`	`87`
`85`	`88`	`fileInfo, err := imageFile.Stat()`
`86`	`89`	`if err != nil {`
`87`	`90`	`return false, err`
`88`	`91`	`}`
`89`		`- _, err = iso9660.Read(imageFile, fileInfo.Size(), 0, 0)`
	`92`	`+ _, err = iso9660.Read(backendFile, fileInfo.Size(), 0, 0)`
`90`	`93`	`return err == nil, nil`
`91`	`94`	`}`