Merge pull request #13428 from tomponline/tp-usb

Device: Don't require `usb` devices to have a `serial`
canonical · May 3, 2024 · b17dc08 · b17dc08
2 parents ea3f443 + 575c826
commit b17dc08
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lxd/device/usb.go b/lxd/device/usb.go
@@ -327,6 +327,11 @@ func (d *usb) loadRawValues(p string) (map[string]string, error) {
 	for k := range values {
 		v, err := os.ReadFile(path.Join(p, k))
 		if err != nil {
+			// Not all devices have a serial file.
+			if k == "serial" && os.IsNotExist(err) {
+				continue
+			}
+
 			return nil, err
 		}
 

diff --git a/lxd/fsmonitor/drivers/driver_fanotify.go b/lxd/fsmonitor/drivers/driver_fanotify.go
@@ -144,7 +144,7 @@ func (d *fanotify) getEvents(ctx context.Context, mountFd int) {
 		fd, err := unix.OpenByHandleAt(mountFd, fh, 0)
 		if err != nil {
 			errno := err.(unix.Errno)
-			if errno != unix.ESTALE {
+			if ctx.Err() == nil && errno != unix.ESTALE {
 				d.logger.Error("Failed to open file", logger.Ctx{"err": err})
 			}