From f021b8ddba1f37e944caac465e04930eea450a7a Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com>
Date: Mon, 18 Dec 2017 14:18:06 +0000
Subject: [PATCH 103/104] ZFS: fix disable

Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 debian/rules | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 76486bc17a70..d2de30d5c383 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,6 @@ ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
 	do_tools=false
 	disable_d_i=true
 	do_zfs=false
-	do_zfs_disable:=$(shell cat $(DROOT)/zfs-modules.ignore >>$(prev_abidir)/../modules.ignore)
 endif
 
 # Stages -- support both DEB_STAGE=stage1 and DEB_BUILD_PROFILE=bootstrap
@@ -78,6 +77,10 @@ ifneq ($(do_tools),true)
 	do_tools_common=
 endif
 
+ifeq ($(do_zfs),false)
+	do_zfs_disable:=$(shell cat $(DROOT)/zfs-modules.ignore >>$(prev_abidir)/../modules.ignore)
+endif
+
 # Either tools package needs the common source preparation
 do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools)))
 
-- 
2.15.1