Merge pull request #1450 from dfr/freebsd-zfs

Use unix.Open instead of os.OpenFile for /dev/zfs
containers · Dec 13, 2022 · 9587fda · 9587fda
2 parents b062e9e + aeed7a1
commit 9587fda
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/drivers/zfs/zfs.go b/drivers/zfs/zfs.go
@@ -57,12 +57,12 @@ func Init(base string, opt graphdriver.Options) (graphdriver.Driver, error) {
 		return nil, fmt.Errorf("the 'zfs' command is not available: %w", graphdriver.ErrPrerequisites)
 	}
 
-	file, err := os.OpenFile("/dev/zfs", os.O_RDWR, 0600)
+	file, err := unix.Open("/dev/zfs", unix.O_RDWR, 0600)
 	if err != nil {
 		logger.Debugf("cannot open /dev/zfs: %v", err)
 		return nil, fmt.Errorf("could not open /dev/zfs: %v: %w", err, graphdriver.ErrPrerequisites)
 	}
-	defer file.Close()
+	defer unix.Close(file)
 
 	options, err := parseOptions(opt.DriverOptions)
 	if err != nil {

diff --git a/tests/helpers.bash b/tests/helpers.bash
@@ -3,7 +3,7 @@
 STORAGE_BINARY=${STORAGE_BINARY:-$(dirname ${BASH_SOURCE})/../containers-storage}
 TESTSDIR=${TESTSDIR:-$(dirname ${BASH_SOURCE})}
 STORAGE_DRIVER=${STORAGE_DRIVER:-vfs}
-STORAGE_TRANSIENT=${STORAGE_TRANSIENT:-}
+STORAGE_TRANSIENT=${STORAGE_TRANSIENT:-0}
 STORAGE_OPTION=${STORAGE_OPTION:-}
 PATH=$(dirname ${BASH_SOURCE})/..:${PATH}
 OS=$(uname -s)