3df43e2f66
Remove getline patch. It seems to be for uClibc, which is no longer in the tree. Remove commands patch. Issue was fixed upstream. Same with the tests patch. Remove gpg patch. It's an upstream backport. Refreshed others. Signed-off-by: Rosen Penev <rosenp@gmail.com>
24 lines
897 B
Diff
24 lines
897 B
Diff
--- a/templates/lxc-download.in
|
|
+++ b/templates/lxc-download.in
|
|
@@ -512,20 +512,7 @@ fi
|
|
# Unpack the rootfs
|
|
echo "Unpacking the rootfs"
|
|
|
|
-EXCLUDES=""
|
|
-excludelist=$(relevant_file excludes)
|
|
-if [ -f "${excludelist}" ]; then
|
|
- while read -r line; do
|
|
- EXCLUDES="${EXCLUDES} --exclude=${line}"
|
|
- done < "${excludelist}"
|
|
-fi
|
|
-
|
|
-# Do not surround ${EXCLUDES} by quotes. This does not work. The solution could
|
|
-# use array but this is not POSIX compliant. The only POSIX compliant solution
|
|
-# is to use a function wrapper, but the latter can't be used here as the args
|
|
-# are dynamic. We thus need to ignore the warning brought by shellcheck.
|
|
-# shellcheck disable=SC2086
|
|
-tar --anchored ${EXCLUDES} --numeric-owner -xpJf "${LXC_CACHE_PATH}/rootfs.tar.xz" -C "${LXC_ROOTFS}"
|
|
+tar --numeric-owner -xpJf "${LXC_CACHE_PATH}/rootfs.tar.xz" -C "${LXC_ROOTFS}"
|
|
|
|
mkdir -p "${LXC_ROOTFS}/dev/pts/"
|
|
|