[lxc/lxc] df3301: Fix off-by-one error constructing mount options

[Christian Brauner]

Branch: refs/heads/master
Home: https://github.com/lxc/lxc
Commit: df3301046fc5f31881a2d4736cc5c381342ecc3d
https://github.com/lxc/lxc/commit/df3301046fc5f31881a2d4736cc5c381342ecc3d
Author: srd424 <srd...@users.noreply.github.com>
Date: 2022-07-03 (Sun, 03 Jul 2022)

Changed paths:
M src/lxc/storage/overlay.c

Log Message:
-----------
Fix off-by-one error constructing mount options

This fixes a really subtle off-by-one error constructing overlay mount options if rootfs options are provided and modern overlayfs (i.e. requiring a workdir) is used. We need to allow for the extra "," required to separate the extra options when computing the length!

Signed-off-by: srd424 <srd...@users.noreply.github.com>


Commit: 3d360cf9dbf556e5ff90b562fa3baac73821a342
https://github.com/lxc/lxc/commit/3d360cf9dbf556e5ff90b562fa3baac73821a342
Author: srd424 <srd...@users.noreply.github.com>
Date: 2022-07-03 (Sun, 03 Jul 2022)

Changed paths:
M src/lxc/storage/overlay.c

Log Message:
-----------
Store mount options in correct variable

This was exposed by the fix in the previous commit.

Signed-off-by: srd424 <srd...@users.noreply.github.com>


Commit: 890d0da21572fa4d28f1e45ee38036cee4457314
https://github.com/lxc/lxc/commit/890d0da21572fa4d28f1e45ee38036cee4457314
Author: Christian Brauner <christia...@ubuntu.com>
Date: 2022-07-04 (Mon, 04 Jul 2022)

Changed paths:
M src/lxc/storage/overlay.c

Log Message:
-----------
Merge pull request #4161 from srd424/patch-1

Fix errors constructing mount string when extra mount options supplied


Compare: https://github.com/lxc/lxc/compare/cf1f3bc45904...890d0da21572