Unverified Commit 6622f651 by Christian Brauner Committed by GitHub

Merge pull request #3800 from evverx/gh3796

parents 77d2bd1a 94019577
......@@ -48,16 +48,6 @@ ASAN_OPTIONS=$ASAN_OPTIONS:detect_leaks=0 UBSAN_OPTIONS=$UBSAN_OPTIONS /usr/bin/
EOF
chmod +x /usr/bin/lxc-test-concurrent
if [[ "$CC" == "clang" ]]; then
mv /usr/bin/{lxc-test-console-log,test-console-log.orig}
cat <<EOF >/usr/bin/lxc-test-console-log
#!/bin/bash
printf "Memory leaks are ignored due to https://github.com/lxc/lxc/issues/3796.\n"
ASAN_OPTIONS=$ASAN_OPTIONS:detect_leaks=0 UBSAN_OPTIONS=$UBSAN_OPTIONS /usr/bin/test-console-log.orig
EOF
chmod +x /usr/bin/lxc-test-console-log
fi
sed -i 's/USE_LXC_BRIDGE="false"/USE_LXC_BRIDGE="true"/' /etc/default/lxc
systemctl daemon-reload
systemctl restart apparmor
......
......@@ -109,6 +109,7 @@ int main(int argc, char *argv[])
lxc_debug("Retrieved %" PRIu64
" bytes from console log. Contents are \"%s\"\n",
*log.read_max, log.data);
free(log.data);
}
/* Leave another two seconds to ensure boot is finished. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment