Skip to content

Windows: Move to fstab options as per OCI#26577

Merged
tonistiigi merged 1 commit intomoby:masterfrom
microsoft:jjh/fstabmount
Sep 19, 2016
Merged

Windows: Move to fstab options as per OCI#26577
tonistiigi merged 1 commit intomoby:masterfrom
microsoft:jjh/fstabmount

Conversation

@lowenna
Copy link
Copy Markdown
Member

@lowenna lowenna commented Sep 14, 2016

Signed-off-by: John Howard [email protected]

No functional changes. Minor update to the currently hacked non-OCI compliant spec used in Windows to get closer to OCI compliance. Instead of an explicit readonly field, uses the fstab style options as per the current OCI spec (even though fstab is strictly meaningless on Windows).

The mount structure is now identical to https://github.com/opencontainers/runtime-spec/blob/master/specs-go/config.go#L84-L95

@thaJeztah
Copy link
Copy Markdown
Member

ping @crosbymichael @stevvooe PTAL

Comment thread libcontainerd/client_windows.go Outdated
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a newline before }? This looks very weird.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. Will do in the morning. It's what gofmt did though...

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Odd. Did it pull up the newline?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stevvooe Turns out if you omit the last ,, a } on the same line is syntactically correct for the compiler and for godoc. However, if you put the } on a new line, the compiler requires the trailing comma. Learn something every day 😇

Anyway, put the brace on the new line instead and pushed an update.

Comment thread libcontainerd/windowsoci/oci_windows.go Outdated
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change backwards compatible?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fortunately that's not a concern on Windows yet :)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But yes in this case.

@thaJeztah
Copy link
Copy Markdown
Member

LGTM

@stevvooe can you leave your LGTM? (I know the new GitHub features are cool, but I think we still need a 'LGTM')

@thaJeztah thaJeztah added this to the 1.13.0 milestone Sep 16, 2016
@lowenna
Copy link
Copy Markdown
Member Author

lowenna commented Sep 19, 2016

@mlaventure @tonistiigi PTAL. Thanks.

Copy link
Copy Markdown
Member

@tonistiigi tonistiigi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants