Skip to content

Commit b624486

Browse files
samuelkarpsamuelkarp
committed
native: support for FreeBSD
Signed-off-by: Samuel Karp <[email protected]>
1 parent d6baafa commit b624486

3 files changed

Lines changed: 49 additions & 6 deletions

File tree

‎snapshots/native/native.go‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -327,12 +327,9 @@ func (o *snapshotter) mounts(s storage.Snapshot) []mount.Mount {
327327

328328
return []mount.Mount{
329329
{
330-
Source: source,
331-
Type: "bind",
332-
Options: []string{
333-
roFlag,
334-
"rbind",
335-
},
330+
Source: source,
331+
Type: mountType,
332+
Options: append(defaultMountOptions, roFlag),
336333
},
337334
}
338335
}

‎snapshots/native/native_default.go‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// +build !freebsd
2+
3+
/*
4+
Copyright The containerd Authors.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
*/
18+
19+
package native
20+
21+
const mountType = "bind"
22+
23+
var defaultMountOptions = []string{"rbind"}

‎snapshots/native/native_freebsd.go‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// +build freebsd
2+
3+
/*
4+
Copyright The containerd Authors.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
*/
18+
19+
package native
20+
21+
const mountType = "nullfs"
22+
23+
var defaultMountOptions = []string{}

0 commit comments

Comments
 (0)