| Message ID | 20190221165451.4232-4-cascardo@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | Split copy-files from update-from-*master | expand |
diff --git a/debian.azure-trusty/scripts/helpers/local-mangle b/debian.azure-trusty/scripts/helpers/local-mangle index 79f36e1b114f..daa2f1f55d74 100755 --- a/debian.azure-trusty/scripts/helpers/local-mangle +++ b/debian.azure-trusty/scripts/helpers/local-mangle @@ -10,4 +10,4 @@ sed -i -e 's/^.*CONFIG_CC_STACKPROTECTOR_REGULAR.*$/CONFIG_CC_STACKPROTECTOR_REG sed -i 's/CONFIG_CC_STACKPROTECTOR_STRONG/CONFIG_CC_STACKPROTECTOR_REGULAR/' "${DEBIAN}/config/annotations" # Disable ZFS as we have no tooling in trusty to mount these. -sed -i -e 's/^\(do_zfs[ \t]*=[ \t]\)true\(.*\)$/\1false\2/' "debian.xenial/rules.d/"*.mk +sed -i -e 's/^\(do_zfs[ \t]*=[ \t]\)true\(.*\)$/\1false\2/' "${DEBIAN}/rules.d/"*.mk
The update script was supposed to disable ZFS, but it wasn't. Now that it was split into copy-file and local-mangle, fix local-mangle so it will really disable it. Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> --- debian.azure-trusty/scripts/helpers/local-mangle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)