p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #34754 from Microsoft/jjh/read-only

Browse Source 
LCOW: VHDX boot to readonly.
Upstream-commit: 969b76d85f93e214cbc44f25a3f44b67cb0dc078
Component: engine
This commit is contained in:
Yong Tang
2017-09-12 08:35:21 -07:00
committed by GitHub
parent 52611dee7a c87a482794
commit 1d65628454
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/libcontainerd/client_windows.go
View File

@ -343,7 +343,7 @@ func (clnt *client) createLinux(containerID string, checkpoint string, checkpoin
configuration.HvRuntime = &hcsshim.HvRuntime{
ImagePath: lcowOpt.Config.Vhdx,
BootSource: "Vhd",
WritableBootSource: true,
WritableBootSource: false,
}
} else {
configuration.HvRuntime = &hcsshim.HvRuntime{

2
components/engine/vendor.conf
View File

@ -8,7 +8,7 @@ github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a
github.com/go-check/check 4ed411733c5785b40214c70bce814c3a3a689609 https://github.com/cpuguy83/check.git
github.com/gorilla/context v1.1
github.com/gorilla/mux v1.1
github.com/Microsoft/opengcs v0.3.2
github.com/Microsoft/opengcs v0.3.3
github.com/kr/pty 5cf931ef8f
github.com/mattn/go-shellwords v1.0.3
github.com/sirupsen/logrus v1.0.1

6
components/engine/vendor/github.com/Microsoft/opengcs/client/config.go generated vendored
View File

@ -93,10 +93,10 @@ func ParseOptions(options []string) (Options, error) {
case "lcow.timeout":
var err error
if rOpts.TimeoutSeconds, err = strconv.Atoi(opt[1]); err != nil {
return rOpts, fmt.Errorf("opengcstimeoutsecs option could not be interpreted as an integer")
return rOpts, fmt.Errorf("lcow.timeout option could not be interpreted as an integer")
}
if rOpts.TimeoutSeconds < 0 {
return rOpts, fmt.Errorf("opengcstimeoutsecs option cannot be negative")
return rOpts, fmt.Errorf("lcow.timeout option cannot be negative")
}
}
}
@ -242,7 +242,7 @@ func (config *Config) StartUtilityVM() error {
configuration.HvRuntime = &hcsshim.HvRuntime{
ImagePath: config.Vhdx,
BootSource: "Vhd",
WritableBootSource: true,
WritableBootSource: false,
}
} else {
configuration.HvRuntime = &hcsshim.HvRuntime{