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.

Sign up for GitHub

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

Jump to bottom

cmd: disable the re-associate fix as requested by jdstrand #3076

Merged
merged 2 commits into from Mar 31, 2017
Merged

cmd: disable the re-associate fix as requested by jdstrand #3076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfa9f9a
cmd: disable the re-associate fix as requested by jdstrand
zyga Mar 24, 2017
7713575
tests: disable 1644439 regression test
zyga Mar 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions cmd/snap-confine/snap-confine.c
View file
Open in desktop
Expand Up @@ -137,7 +137,15 @@ int main(int argc, char **argv)
* snap-specific namespace, has a predictable PID and is long
* lived.
*/
#if 0
// FIXME: this was reverted as requested by jdstrand because the
// corresponding fix in the kernel was reverted as well. It should
// be re-enabled with an upcoming kernel package that contains all
// of the apparmor fixes.
//
// https://github.com/snapcore/snapd/pull/2624#issuecomment-288732682
sc_reassociate_with_pid1_mount_ns();
#endif
const char *group_name = snap_name;
if (group_name == NULL) {
die("SNAP_NAME is not set");
Expand Down
1 change: 1 addition & 0 deletions tests/regression/lp-1644439/task.yaml
View file
Open in desktop
@@ -1,4 +1,5 @@
summary: Regression test for https://bugs.launchpad.net/snap-confine/+bug/1644439
manual: true # see https://github.com/snapcore/snapd/pull/3076
details: |
snap-confine uses privately-shared /run/snapd/ns to store bind-mounted
mount namespaces of each snap. In the case that snap-confine is invoked
Expand Down