gofmt

fs/setup.go

@@ -56,28 +56,28 @@ type fsDeviceDefinition struct {
 	perm uint32
 }
 
-const ugorw = syscall.S_IRUSR|syscall.S_IWUSR | syscall.S_IRGRP|syscall.S_IWGRP | syscall.S_IROTH|syscall.S_IWOTH
-const urwgr = syscall.S_IRUSR|syscall.S_IWUSR | syscall.S_IRGRP
-const urw = syscall.S_IRUSR|syscall.S_IWUSR
+const ugorw = syscall.S_IRUSR | syscall.S_IWUSR | syscall.S_IRGRP | syscall.S_IWGRP | syscall.S_IROTH | syscall.S_IWOTH
+const urwgr = syscall.S_IRUSR | syscall.S_IWUSR | syscall.S_IRGRP
+const urw = syscall.S_IRUSR | syscall.S_IWUSR
 
 var basicDevices = []fsDeviceDefinition{
-	{path: "/dev/full", mode: syscall.S_IFCHR|ugorw, dev: _makedev(1, 7), perm: 0666},
-	{path: "/dev/null", mode: syscall.S_IFCHR|ugorw, dev: _makedev(1, 3), perm: 0666},
-	{path: "/dev/random", mode: syscall.S_IFCHR|ugorw, dev: _makedev(1, 8), perm: 0666},
+	{path: "/dev/full", mode: syscall.S_IFCHR | ugorw, dev: _makedev(1, 7), perm: 0666},
+	{path: "/dev/null", mode: syscall.S_IFCHR | ugorw, dev: _makedev(1, 3), perm: 0666},
+	{path: "/dev/random", mode: syscall.S_IFCHR | ugorw, dev: _makedev(1, 8), perm: 0666},
 
-	{path: "/dev/console", mode: syscall.S_IFCHR|urw, dev: _makedev(5, 1), perm: 0600},
-	{path: "/dev/tty", mode: syscall.S_IFCHR|ugorw, dev: _makedev(5, 0), perm: 0666},
-	{path: "/dev/tty1", mode: syscall.S_IFREG|urwgr, dev: 0, perm: 0640},
-	{path: "/dev/tty2", mode: syscall.S_IFREG|urwgr, dev: 0, perm: 0640},
-	{path: "/dev/tty3", mode: syscall.S_IFREG|urwgr, dev: 0, perm: 0640},
-	{path: "/dev/tty4", mode: syscall.S_IFREG|urwgr, dev: 0, perm: 0640},
+	{path: "/dev/console", mode: syscall.S_IFCHR | urw, dev: _makedev(5, 1), perm: 0600},
+	{path: "/dev/tty", mode: syscall.S_IFCHR | ugorw, dev: _makedev(5, 0), perm: 0666},
+	{path: "/dev/tty1", mode: syscall.S_IFREG | urwgr, dev: 0, perm: 0640},
+	{path: "/dev/tty2", mode: syscall.S_IFREG | urwgr, dev: 0, perm: 0640},
+	{path: "/dev/tty3", mode: syscall.S_IFREG | urwgr, dev: 0, perm: 0640},
+	{path: "/dev/tty4", mode: syscall.S_IFREG | urwgr, dev: 0, perm: 0640},
 
-	{path: "/dev/urandom", mode: syscall.S_IFCHR|ugorw, dev: _makedev(1, 9), perm: 0666},
-	{path: "/dev/zero", mode: syscall.S_IFCHR|ugorw, dev: _makedev(1, 5), perm: 0666},
+	{path: "/dev/urandom", mode: syscall.S_IFCHR | ugorw, dev: _makedev(1, 9), perm: 0666},
+	{path: "/dev/zero", mode: syscall.S_IFCHR | ugorw, dev: _makedev(1, 5), perm: 0666},
 }
 
 func _makedev(x, y int) int {
-	return (((x)<<8) | (y))
+	return (((x) << 8) | (y))
 }
 
 func (fs *Filesystem) Setup(profilesPath string) error {
@@ -85,7 +85,7 @@ func (fs *Filesystem) Setup(profilesPath string) error {
 	for _, bd := range basicBindDirs {
 		if bd == profilesPath {
 			profilePathInBindDirs = true
-			break;
+			break
 		}
 	}
 
@@ -151,8 +151,8 @@ func (fs *Filesystem) setupRootfs() error {
 	if err := syscall.Mount(fs.base, fs.base, "tmpfs", flags, data); err != nil {
 		return fmt.Errorf("failed to create base tmpfs at %s: %v", fs.base, err)
 	}
-/*
-// Currently unused
+	/*
+	   // Currently unused
 	   	// create extra directories
 	   	extra := []string{"sockets", "dev"}
 	   	for _, sub := range extra {
@@ -161,7 +161,7 @@ func (fs *Filesystem) setupRootfs() error {
 	   			return fmt.Errorf("unable to create directory (%s): %v", d, err)
 	   		}
 	   	}
-*/
+	*/
 	return nil
 }
 

network/daemon.go

@@ -1,6 +1,6 @@
 package network
 
-import(
+import (
 	//Builtin
 	"errors"
 	"fmt"
@@ -40,7 +40,7 @@ func BridgeInit(bridgeMAC string, nmIgnoreFile string, log *logging.Logger) (*Ho
 		}
 	}
 
-	if err:= htn.configureBridgeInterface(br, log); err != nil {
+	if err := htn.configureBridgeInterface(br, log); err != nil {
 		return nil, err
 	}
 
@@ -85,7 +85,7 @@ func NetInit(stn *SandboxNetwork, htn *HostNetwork, childPid int, log *logging.L
 	// Seed random number generator (poorly but we're not doing crypto)
 	rand.Seed(time.Now().Unix() ^ int64((os.Getpid() + childPid)))
 
-	log.Info("Configuring host veth pair '%s' with: %s", stn.VethHost, stn.Ip + "/" + htn.Class)
+	log.Info("Configuring host veth pair '%s' with: %s", stn.VethHost, stn.Ip+"/"+htn.Class)
 
 	// Fetch the bridge from the ifname
 	br, err := tenus.BridgeFromName(ozDefaultInterfaceBridge)
@@ -192,7 +192,7 @@ func (htn *HostNetwork) configureBridgeInterface(br tenus.Bridger, log *logging.
 	return nil
 }
 
-func (htn *HostNetwork)buildBridgeNetwork(addrs []net.Addr) error {
+func (htn *HostNetwork) buildBridgeNetwork(addrs []net.Addr) error {
 	// Try to build the network config from the bridge's address
 	addrIndex := -1
 	for i, addr := range addrs {

network/network.go

@@ -4,8 +4,8 @@ import (
 	//Builtin
 	"fmt"
 	"net"
-	"strings"
 	"strconv"
+	"strings"
 
 	"github.com/op/go-logging"
 )
@@ -71,7 +71,6 @@ func init() {
 	}
 }
 
-
 // Print status of the network interfaces
 func NetPrint(log *logging.Logger) {
 	strLine := ""
@@ -139,7 +138,6 @@ func NetPrint(log *logging.Logger) {
 
 }
 
-
 // Convert longip to net.IP
 func inet_ntoa(ipnr uint64) net.IP {
 	var bytes [4]byte