Skip to content

Use IoctlSetPointerInt from golang.org/x/sys/unix#40

Merged
estesp merged 2 commits intocontainerd:masterfrom
tklauser:ioctl-darwin
Sep 16, 2020
Merged

Use IoctlSetPointerInt from golang.org/x/sys/unix#40
estesp merged 2 commits intocontainerd:masterfrom
tklauser:ioctl-darwin

Conversation

@tklauser
Copy link
Copy Markdown
Contributor

Update the golang.org/x/sys/unix dependency and use unix.IoctlSetPointerInt
instead of manually implementing it. This fixes the build on darwin
where direct syscalls, i.e. unix.Syscall(SYS_IOCTL, ...) are no longer
allowed and exported as of golang/sys@6fcdbc0

This should unblock #39 /cc @thaJeztah

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Use unix.IoctlSetPointerInt instead of manually implementing it. This
fixes the build on darwin where direct syscalls, i.e.
unix.Syscall(SYS_IOCTL, ...) are no longer allowed and exported as of
golang/sys@6fcdbc0

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
@thaJeztah
Copy link
Copy Markdown
Member

Thank you! I posted #39, and then realised that the changes in moby/term were because of the same issue, but didn't find the time yet to look into it <3

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah
Copy link
Copy Markdown
Member

@crosbymichael @tonistiigi PTAL

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@estesp estesp merged commit 1526a8e into containerd:master Sep 16, 2020
@tklauser tklauser deleted the ioctl-darwin branch September 16, 2020 12:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants