Merge pull request #33826 from Microsoft/jjh/lcownits

LCOW: Fix nits from 33241
Upstream-commit: 950d472c9ce4180b80e28030f7de68ffc3254f97
Component: engine
This commit is contained in:
John Howard
2017-06-27 22:56:38 -07:00
committed by GitHub
18 changed files with 29 additions and 32 deletions
@@ -118,7 +118,7 @@ func (d *Driver) terminateUvm(context string) error {
// FIXME: @jhowardmsft
// This isn't thread-safe yet, but will change anyway with the lifetime
// changes and multiple instances. Defering that work for now.
// changes and multiple instances. Deferring that work for now.
uvm := d.config.Uvm
d.config.Uvm = nil
@@ -190,7 +190,6 @@ func (d *Driver) Create(id, parent string, opts *graphdriver.CreateOpts) error {
// Make sure layers are created with the correct ACL so that VMs can access them.
layerPath := d.dir(id)
logrus.Debugf("lcowdriver: create: id %s: creating layerPath %s", id, layerPath)
// Make sure the layers are created with the correct ACL so that VMs can access them.
if err := system.MkdirAllWithACL(layerPath, 755, system.SddlNtvmAdministratorsLocalSystem); err != nil {
return err
}
@@ -154,7 +154,7 @@ func (d *Driver) Status() [][2]string {
}
// panicIfUsedByLcow does exactly what it says.
// TODO @jhowardmsft - this is an temporary measure for the bring-up of
// TODO @jhowardmsft - this is a temporary measure for the bring-up of
// Linux containers on Windows. It is a failsafe to ensure that the right
// graphdriver is used.
func panicIfUsedByLcow() {