osutil: reorg and stub out things to get it building on darwin

With this, cmd/snap itself builds on darwin.
zhsj · Aug 21, 2018 · 973cb65 · 973cb65
1 parent f91340d
commit 973cb65
Show file tree

Hide file tree

Showing 19 changed files with 143 additions and 10 deletions.
diff --git a/osutil/mount.go → osutil/mount_linux.go b/osutil/mount.go → osutil/mount_linux.go
diff --git a/osutil/mount_test.go → osutil/mount_linux_test.go b/osutil/mount_test.go → osutil/mount_linux_test.go
diff --git a/osutil/mountentry.go → osutil/mountentry_linux.go b/osutil/mountentry.go → osutil/mountentry_linux.go
diff --git a/osutil/mountentry_test.go → osutil/mountentry_linux_test.go b/osutil/mountentry_test.go → osutil/mountentry_linux_test.go
diff --git a/osutil/mountinfo.go → osutil/mountinfo_linux.go b/osutil/mountinfo.go → osutil/mountinfo_linux.go
diff --git a/osutil/mountinfo_test.go → osutil/mountinfo_linux_test.go b/osutil/mountinfo_test.go → osutil/mountinfo_linux_test.go
diff --git a/osutil/mountprofile.go → osutil/mountprofile_linux.go b/osutil/mountprofile.go → osutil/mountprofile_linux.go
diff --git a/osutil/mountprofile_test.go → osutil/mountprofile_linux_test.go b/osutil/mountprofile_test.go → osutil/mountprofile_linux_test.go
diff --git a/osutil/nfs_darwin.go b/osutil/nfs_darwin.go
@@ -0,0 +1,25 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package osutil
+
+// IsHomeUsingNFS is not implemented on darwin
+func IsHomeUsingNFS() (bool, error) {
+	return false, ErrDarwin
+}
diff --git a/osutil/nfs.go → osutil/nfs_linux.go b/osutil/nfs.go → osutil/nfs_linux.go
diff --git a/osutil/nfs_test.go → osutil/nfs_linux_test.go b/osutil/nfs_test.go → osutil/nfs_linux_test.go
diff --git a/osutil/osutil_darwin.go b/osutil/osutil_darwin.go
@@ -0,0 +1,27 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2016-2018 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package osutil
+
+import (
+	"errors"
+)
+
+// Some things are not implemented on darwin
+var ErrDarwin = errors.New("not implemented on darwin")
diff --git a/osutil/overlay_darwin.go b/osutil/overlay_darwin.go
@@ -0,0 +1,25 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2016-2018 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package osutil
+
+// IsRootWritableOverlay is not implemented on darwin
+func IsRootWritableOverlay() (string, error) {
+	return "", ErrDarwin
+}
diff --git a/osutil/overlay.go → osutil/overlay_linux.go b/osutil/overlay.go → osutil/overlay_linux.go
diff --git a/osutil/overlay_test.go → osutil/overlay_linux_test.go b/osutil/overlay_test.go → osutil/overlay_linux_test.go
diff --git a/osutil/uname.go b/osutil/uname.go
@@ -19,12 +19,6 @@
 
 package osutil
 
-import (
-	"syscall"
-)
-
-var syscallUname = syscall.Uname
-
 var KernelVersion = kernelVersion
 
 // We have to implement separate functions for the kernel version and the
@@ -37,8 +31,8 @@ var KernelVersion = kernelVersion
 // for details.
 
 func kernelVersion() string {
-	var u syscall.Utsname
-	if err := syscallUname(&u); err != nil {
+	u, err := uname()
+	if err != nil {
 		return "unknown"
 	}
 
@@ -57,8 +51,8 @@ func kernelVersion() string {
 }
 
 func MachineName() string {
-	var u syscall.Utsname
-	if err := syscallUname(&u); err != nil {
+	u, err := uname()
+	if err != nil {
 		return "unknown"
 	}
 

diff --git a/osutil/uname_darwin.go b/osutil/uname_darwin.go
@@ -0,0 +1,30 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2014-2018 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package osutil
+
+import (
+	"golang.org/x/sys/unix"
+)
+
+func uname() (*unix.Utsname, error) {
+	var u unix.Utsname
+	err := unix.Uname(&u)
+	return &u, err
+}
diff --git a/osutil/uname_linux.go b/osutil/uname_linux.go
@@ -0,0 +1,32 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2014-2018 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package osutil
+
+import (
+	"syscall"
+)
+
+var syscallUname = syscall.Uname
+
+func uname() (*syscall.Utsname, error) {
+	var u syscall.Utsname
+	err := syscallUname(&u)
+	return &u, err
+}
diff --git a/osutil/uname_test.go → osutil/uname_linux_test.go b/osutil/uname_test.go → osutil/uname_linux_test.go