Skip to content

Conversation

vbatts
Copy link
Contributor

@vbatts vbatts commented Nov 29, 2014

upstream switched the word from "overlayfs" to "overlay".
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=ef94b1864d1ed5be54376404bb23d22ed0481feb

Ping @jfrazelle @tiborvass @unclejack
Might should be cherry-picked, since 3.18 will release during the docker-1.4.0 cycle

Signed-off-by: Vincent Batts vbatts@redhat.com

upstream switched the word from "overlayfs" to "overlay".
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=ef94b1864d1ed5be54376404bb23d22ed0481feb

Signed-off-by: Vincent Batts <vbatts@redhat.com>
@tianon
Copy link
Member

tianon commented Nov 29, 2014

Would you mind updating contrib/check-config.sh too? :)

@jessfraz
Copy link
Contributor

Buncha hipsters they made an abreev

On Saturday, November 29, 2014, Tianon Gravi notifications@github.com
wrote:

Would you mind updating contrib/check-config.sh too? :)


Reply to this email directly or view it on GitHub
#9405 (comment).

@cpuguy83
Copy link
Member

cpuguy83 commented Dec 1, 2014

Also see #9426
I think this should be either "overlay" for "overlayfs", since it will only be called "overlay" in mainline. Those compiling their own would have "overlayfs".

Of course, in this particular patch, "overlay" and "overlayfs" will be matched anyway.

@vbatts
Copy link
Contributor Author

vbatts commented Dec 1, 2014

@cpuguy83 ... right. That is why searching that the string includes "overlay" also would match on "overlayfs"... :-)

@lhuard1A
Copy link
Contributor

lhuard1A commented Dec 1, 2014

I tested docker with Linux master.
The syscall.Mount call also has to be modified.
I submitted a PR about that issue: #9426
@tianon : my PR also contains the update of check-config.sh

@jessfraz jessfraz added this to the 1.4 milestone Dec 1, 2014
@jessfraz
Copy link
Contributor

jessfraz commented Dec 1, 2014

added to the milestone, we will get in before 1.4 thanks

@tianon
Copy link
Member

tianon commented Dec 1, 2014

Sorry @vbatts, you get the first-mover gold star, but so far I'm liking #9426 better since it appropriately covers more bits of the code... 😉

@jessfraz
Copy link
Contributor

jessfraz commented Dec 1, 2014

closed in favor of #9426

@jessfraz jessfraz closed this Dec 1, 2014
@vbatts vbatts deleted the vbatts-presence_of_overlay branch December 2, 2014 04:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants