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

Add mount label man page content #53

Merged
merged 1 commit into from
May 2, 2016
Merged

Conversation

rhatdan
Copy link
Contributor

@rhatdan rhatdan commented May 2, 2016

Signed-off-by: Dan Walsh [email protected]

@rhatdan rhatdan changed the title Add mount label support Add mount label man page content May 2, 2016
@mrunalp
Copy link
Contributor

mrunalp commented May 2, 2016

We don't need to pull in the Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/config.go change as the MountLabel change is already included under struct Linux.

@rhatdan
Copy link
Contributor Author

rhatdan commented May 2, 2016

Fixed

@mrunalp
Copy link
Contributor

mrunalp commented May 2, 2016

Could you move this above --network? We recently sorted the options in alphabetic order. Thanks!

@mrunalp
Copy link
Contributor

mrunalp commented May 2, 2016

LGTM

@mrunalp mrunalp merged commit 8ab86b6 into opencontainers:master May 2, 2016
@@ -222,7 +234,7 @@ colon:

You can use SELinux to add security to the container. You must specify the process label to run the init process inside of the container using the --selinux-label.

# ocitools generate --bind /var/db:/data1 --selinux-label system_u:system_r:svirt_lxc_net_t:s0:c1,c2 --rootfs /var/lib/containers/fedora --args bash
# ocitools generate --bind /var/db:/data1 --selinux-label system_u:system_r:svirt_lxc_net_t:s0:c1,c2 --mount-label system_u:object_r:svirt_sandbox_file_t:s0:c1,c2 --rootfs /var/lib/containers/fedora --args bash
Copy link
Contributor

Choose a reason for hiding this comment

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

Busted rebase partially rolling back #46?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What did I break?

Copy link
Contributor

Choose a reason for hiding this comment

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

Markdown literals need four-space indents (or fencing).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok I was looking for something in the text I changed. I fixed the markdown.

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