kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #17980 from Microsoft/jjh/configuresysinit

Browse source 
Remove uncalled configureSysInit
This commit is contained in:
Alexander Morozov 2015-11-13 14:30:03 -08:00
commit 5e2d4aaec2
2 changed files with 0 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
daemon/daemon_unix.go
View file

@ -13,16 +13,13 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver"
"github.com/docker/docker/dockerversion"
derr "github.com/docker/docker/errors" derr "github.com/docker/docker/errors"
pblkiodev "github.com/docker/docker/pkg/blkiodev" pblkiodev "github.com/docker/docker/pkg/blkiodev"
"github.com/docker/docker/pkg/fileutils"
"github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/idtools"
"github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/parsers"
"github.com/docker/docker/pkg/parsers/kernel" "github.com/docker/docker/pkg/parsers/kernel"
"github.com/docker/docker/pkg/sysinfo" "github.com/docker/docker/pkg/sysinfo"
"github.com/docker/docker/runconfig" "github.com/docker/docker/runconfig"
"github.com/docker/docker/utils"
"github.com/docker/docker/volume" "github.com/docker/docker/volume"
"github.com/docker/libnetwork" "github.com/docker/libnetwork"
nwconfig "github.com/docker/libnetwork/config" nwconfig "github.com/docker/libnetwork/config"
@ -300,29 +297,6 @@ func migrateIfDownlevel(driver graphdriver.Driver, root string) error {
return migrateIfAufs(driver, root) return migrateIfAufs(driver, root)
} }
func configureSysInit(config *Config, rootUID, rootGID int) (string, error) {
localCopy := filepath.Join(config.Root, "init", fmt.Sprintf("dockerinit-%s", dockerversion.Version))
sysInitPath := utils.DockerInitPath(localCopy)
if sysInitPath == "" {
return "", fmt.Errorf("Could not locate dockerinit: This usually means docker was built incorrectly. See https://docs.docker.com/project/set-up-dev-env/ for official build instructions.")
}
if sysInitPath != localCopy {
// When we find a suitable dockerinit binary (even if it's our local binary), we copy it into config.Root at localCopy for future use (so that the original can go away without that being a problem, for example during a package upgrade).
if err := idtools.MkdirAs(filepath.Dir(localCopy), 0700, rootUID, rootGID); err != nil && !os.IsExist(err) {
return "", err
}
if _, err := fileutils.CopyFile(sysInitPath, localCopy); err != nil {
return "", err
}
if err := os.Chmod(localCopy, 0700); err != nil {
return "", err
}
sysInitPath = localCopy
}
return sysInitPath, nil
}
func isBridgeNetworkDisabled(config *Config) bool { func isBridgeNetworkDisabled(config *Config) bool {
return config.Bridge.Iface == disableNetworkBridge return config.Bridge.Iface == disableNetworkBridge
} }

6
daemon/daemon_windows.go
View file

@ -2,7 +2,6 @@ package daemon
import ( import (
"fmt" "fmt"
"os"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver"
@ -91,11 +90,6 @@ func migrateIfDownlevel(driver graphdriver.Driver, root string) error {
return nil return nil
} }
func configureSysInit(config *Config, rootUID, rootGID int) (string, error) {
// TODO Windows.
return os.Getenv("TEMP"), nil
}
func isBridgeNetworkDisabled(config *Config) bool { func isBridgeNetworkDisabled(config *Config) bool {
return false return false
} }