Allow non-root users to query btrfs volumes

leth · dennwc · commit a1f570bd01a1 · 2023-03-12T23:18:31.000+02:00
diff --git a/btrfs.go b/btrfs.go
@@ -29,6 +29,11 @@ func Open(path string, ro bool) (*FS, error) {
 	)
 	if ro {
 		dir, err = os.OpenFile(path, os.O_RDONLY|syscall.O_NOATIME, 0644)
+		if err != nil {
+			// Try without O_NOATIME as it requires ownership of the file
+			// or other priviliges
+			dir, err = os.OpenFile(path, os.O_RDONLY, 0644)
+		}
 	} else {
 		dir, err = os.Open(path)
 	}

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,11 @@ func Open(path string, ro bool) (*FS, error) {`
`29`	`29`	`)`
`30`	`30`	`if ro {`
`31`	`31`	`dir, err = os.OpenFile(path, os.O_RDONLY\|syscall.O_NOATIME, 0644)`
	`32`	`+ if err != nil {`
	`33`	`+ // Try without O_NOATIME as it requires ownership of the file`
	`34`	`+ // or other priviliges`
	`35`	`+ dir, err = os.OpenFile(path, os.O_RDONLY, 0644)`
	`36`	`+ }`
`32`	`37`	`} else {`
`33`	`38`	`dir, err = os.Open(path)`
`34`	`39`	`}`