diff options
| author | Paweł Stołowski <stolowski@gmail.com> | 2021-01-18 09:12:55 +0000 |
|---|---|---|
| committer | Paweł Stołowski <stolowski@gmail.com> | 2021-01-18 09:12:55 +0000 |
| commit | 459ce2298edf3829fc7919694bb8387064766cae (patch) | |
| tree | 34a41759166fe18db708471357993ea0cf65238c | |
| parent | 8ac3dd448785ffd8ee533555375c8e733465029c (diff) | |
| parent | 74655bbaaa50f599d9ecaad20bbd95d0c6476728 (diff) | |
Merge commit '74655bbaaa50f599d9ecaad20bbd95d0c6476728' into update-go-udevupdate-go-udev
| -rw-r--r-- | osutil/udev/.travis.yml | 4 | ||||
| -rw-r--r-- | osutil/udev/go.mod | 5 | ||||
| -rw-r--r-- | osutil/udev/netlink/conn.go | 1 | ||||
| -rw-r--r-- | osutil/udev/netlink/conn_test.go | 5 |
4 files changed, 9 insertions, 6 deletions
diff --git a/osutil/udev/.travis.yml b/osutil/udev/.travis.yml index cd98282945..2aca6f4fa5 100644 --- a/osutil/udev/.travis.yml +++ b/osutil/udev/.travis.yml @@ -1,7 +1,7 @@ language: go - + go: - - 1.9.x + - 1.x - master script: diff --git a/osutil/udev/go.mod b/osutil/udev/go.mod new file mode 100644 index 0000000000..4f10d9696c --- /dev/null +++ b/osutil/udev/go.mod @@ -0,0 +1,5 @@ +module github.com/pilebones/go-udev + +go 1.15 + +require github.com/kr/pretty v0.2.1 diff --git a/osutil/udev/netlink/conn.go b/osutil/udev/netlink/conn.go index 5b326d5fe2..0054363228 100644 --- a/osutil/udev/netlink/conn.go +++ b/osutil/udev/netlink/conn.go @@ -41,7 +41,6 @@ func (c *UEventConn) Connect(mode Mode) (err error) { c.Addr = syscall.SockaddrNetlink{ Family: syscall.AF_NETLINK, Groups: uint32(mode), - Pid: uint32(os.Getpid()), } if err = syscall.Bind(c.Fd, &c.Addr); err != nil { diff --git a/osutil/udev/netlink/conn_test.go b/osutil/udev/netlink/conn_test.go index e44b28837b..fb5955979b 100644 --- a/osutil/udev/netlink/conn_test.go +++ b/osutil/udev/netlink/conn_test.go @@ -18,9 +18,8 @@ func TestConnect(t *testing.T) { defer conn.Close() conn2 := new(UEventConn) - if err := conn2.Connect(UdevEvent); err == nil { - // see issue: https://github.com/pilebones/go-udev/issues/3 by @stolowski - t.Fatal("can't subscribing a second time to netlink socket with PID", conn2.Addr.Pid) + if err := conn2.Connect(UdevEvent); err != nil { + t.Fatal("unable to subscribe to netlink uevent a second time, err:", err) } defer conn2.Close() } |