Skip to content

Commit

Permalink
Merge pull request #289 from tommady/pass-uid_mapping-test-#255
Browse files Browse the repository at this point in the history
Pass uid_mapping test
  • Loading branch information
utam0k authored Sep 11, 2021
2 parents 734ec2e + e0622c4 commit 5d2901e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion integration_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ test_cases=(
# "linux_rootfs_propagation/linux_rootfs_propagation.t"
# "linux_seccomp/linux_seccomp.t"
"linux_sysctl/linux_sysctl.t"
# "linux_uid_mappings/linux_uid_mappings.t"
"linux_uid_mappings/linux_uid_mappings.t"
"misc_props/misc_props.t"
"mounts/mounts.t"
# "pidfile/pidfile.t"
Expand Down
6 changes: 3 additions & 3 deletions src/rootfs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,9 @@ fn bind_dev(rootfs: &Path, dev: &LinuxDevice) -> Result<()> {
)?;
close(fd)?;
nix_mount(
Some(&full_container_path),
&dev.path,
None::<&str>,
Some(&dev.path),
&full_container_path,
Some("bind"),
MsFlags::MS_BIND,
None::<&str>,
)?;
Expand Down

0 comments on commit 5d2901e

Please sign in to comment.