move sys.FMountat() into mount package

thaJeztah · thaJeztah · commit 21f532d51891 · 2021-06-23T18:14:30.000+02:00
It's the only location this is used, so might as well move it
into that package. I could not find external users of this utility,
so not adding an alias / deprecation.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/mount/fmountat_linux.go b/mount/fmountat_linux.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sys
+package mount
 
 import (
 	"runtime"
diff --git a/mount/fmountat_linux_test.go b/mount/fmountat_linux_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sys
+package mount
 
 import (
 	"io/ioutil"
@@ -32,7 +32,7 @@ import (
 type fMountatCaseFunc func(t *testing.T, root string)
 
 func TestFMountat(t *testing.T) {
-	if !runningPrivileged() {
+	if unix.Geteuid() != 0 {
 		t.Skip("Needs to be run as root")
 		return
 	}
diff --git a/mount/mount_linux.go b/mount/mount_linux.go
@@ -24,7 +24,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containerd/containerd/sys"
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 )
@@ -378,7 +377,7 @@ func mountAt(chdir string, source, target, fstype string, flags uintptr, data st
 	if !fs.IsDir() {
 		return errors.Wrap(errors.Errorf("%s is not dir", chdir), "failed to mountat")
 	}
-	return errors.Wrap(sys.FMountat(f.Fd(), source, target, fstype, flags, data), "failed to mountat")
+	return errors.Wrap(FMountat(f.Fd(), source, target, fstype, flags, data), "failed to mountat")
 }
 
 func (m *Mount) mountWithHelper(helperBinary, typePrefix, target string) error {
diff --git a/mount/subprocess_unsafe_linux.go b/mount/subprocess_unsafe_linux.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sys
+package mount
 
 import (
 	_ "unsafe" // required for go:linkname.
diff --git a/mount/subprocess_unsafe_linux.s b/mount/subprocess_unsafe_linux.s

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ import (`
`24`	`24`	`"strings"`
`25`	`25`	`"time"`
`26`	`26`
`27`		`- "github.com/containerd/containerd/sys"`
`28`	`27`	`"github.com/pkg/errors"`
`29`	`28`	`"golang.org/x/sys/unix"`
`30`	`29`	`)`
`@@ -378,7 +377,7 @@ func mountAt(chdir string, source, target, fstype string, flags uintptr, data st`
`378`	`377`	`if !fs.IsDir() {`
`379`	`378`	`return errors.Wrap(errors.Errorf("%s is not dir", chdir), "failed to mountat")`
`380`	`379`	`}`
`381`		`- return errors.Wrap(sys.FMountat(f.Fd(), source, target, fstype, flags, data), "failed to mountat")`
	`380`	`+ return errors.Wrap(FMountat(f.Fd(), source, target, fstype, flags, data), "failed to mountat")`
`382`	`381`	`}`
`383`	`382`
`384`	`383`	`func (m *Mount) mountWithHelper(helperBinary, typePrefix, target string) error {`