Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update devices_unix.go for LXD #1327

Merged
merged 2 commits into from
Mar 9, 2017
Merged

Conversation

CarltonSemple
Copy link
Contributor

getDevices() has been updated to skip /dev/.lxc and /dev/.lxd-mounts, which was breaking privileged Docker containers running on runC inside of LXD managed Linux Containers.

See https://github.com/lxc/lxd/issues/2825

@crosbymichael
Copy link
Member

@CarltonSemple can you sign your commit with the DCO?

getDevices() has been updated to skip `/dev/.lxc` and `/dev/.lxd-mounts`, which was breaking privileged Docker containers running on runC, inside of LXD managed Linux Containers

Signed-off-by: Carlton-Semple <carlton.semple@ibm.com>
@CarltonSemple
Copy link
Contributor Author

@crosbymichael sure thing

@@ -75,7 +75,7 @@ func getDevices(path string) ([]*configs.Device, error) {
switch {
case f.IsDir():
switch f.Name() {
case "pts", "shm", "fd", "mqueue":
case "pts", "shm", "fd", "mqueue", ".lxc", ".lxd-mounts":
Copy link
Contributor

Choose a reason for hiding this comment

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

You better link the issue as comment, otherwise it'll be hard to understand what they are for normal runc users.

@cyphar
Copy link
Member

cyphar commented Mar 8, 2017

/ping @CarltonSemple

Signed-off-by: Carlton-Semple <carlton.semple@ibm.com>
@crosbymichael
Copy link
Member

crosbymichael commented Mar 8, 2017

LGTM

Approved with PullApprove

@hqhq
Copy link
Contributor

hqhq commented Mar 9, 2017

LGTM

@CarltonSemple Next time you can squash your commits for such changes, thanks.

Approved with PullApprove

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.

4 participants