From patchwork Thu Feb 21 16:54:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo X-Patchwork-Id: 1046292 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4450vX4gQMz9sBF; Fri, 22 Feb 2019 03:55:04 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1gwrch-0005LD-7z; Thu, 21 Feb 2019 16:54:59 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1gwrcc-0005HR-Aw for kernel-team@lists.ubuntu.com; Thu, 21 Feb 2019 16:54:54 +0000 Received: from [194.204.107.10] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1gwrcc-0001IL-05 for kernel-team@lists.ubuntu.com; Thu, 21 Feb 2019 16:54:54 +0000 From: Thadeu Lima de Souza Cascardo To: kernel-team@lists.ubuntu.com Subject: [trusty/azure 3/3] UBUNTU: Packaging: Really disable ZFS Date: Thu, 21 Feb 2019 13:54:51 -0300 Message-Id: <20190221165451.4232-4-cascardo@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190221165451.4232-1-cascardo@canonical.com> References: <20190221165451.4232-1-cascardo@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" 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 --- debian.azure-trusty/scripts/helpers/local-mangle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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