Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-06-04 14:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

lb_chroot_layered: fix quoting when searching for trusted.overlay.opaque

Browse Source
This commit is contained in:
Michael Hudson-Doyle 2021-07-28 14:42:46 +12:00
parent 7d41087381
commit 75fe0241f3
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.732) UNRELEASED; urgency=medium
* lb_chroot_layered: fix quoting when searching for
trusted.overlay.opaque
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Fri, 30 Jul 2021 11:56:01 +1200
livecd-rootfs (2.731) impish; urgency=medium livecd-rootfs (2.731) impish; urgency=medium
[ Jason C. McDonald ] [ Jason C. McDonald ]

4
live-build/lb_chroot_layered
View File

@ -130,7 +130,7 @@ reduce_pass_size () {
if ! diff --brief --no-dereference "$pass_dir/$f" "$parent_pass_dir/$f" >/dev/null; then if ! diff --brief --no-dereference "$pass_dir/$f" "$parent_pass_dir/$f" >/dev/null; then
continue continue
fi fi
p=$(dirname $f) p="$(dirname "$f")"
while [ "$p" != . ]; do while [ "$p" != . ]; do
# As explained in the overlayfs documentation # As explained in the overlayfs documentation
# https://www.kernel.org/doc/html/latest/filesystems/overlayfs.html#whiteouts-and-opaque-directories # https://www.kernel.org/doc/html/latest/filesystems/overlayfs.html#whiteouts-and-opaque-directories
@ -147,7 +147,7 @@ reduce_pass_size () {
Echo_message "reduce_pass_size: '%s' would be removed from overlay but for trusted.overlay.opaque on '%s'" "$f" "$p" Echo_message "reduce_pass_size: '%s' would be removed from overlay but for trusted.overlay.opaque on '%s'" "$f" "$p"
continue 2 continue 2
fi fi
p=$(dirname $p) p="$(dirname "$p")"
done done
# Files are strictly identical between the 2 passes (only mod or access times differs). No need for unused delta. # Files are strictly identical between the 2 passes (only mod or access times differs). No need for unused delta.
Echo_message "reduce_pass_size: '%s' is strictly identical between %s and %s. Removing." "$f" "$pass" "$parent" Echo_message "reduce_pass_size: '%s' is strictly identical between %s and %s. Removing." "$f" "$pass" "$parent"