reproducible Debian: re-enable disorderfs on i386

Signed-off-by: Holger Levsen <holger@layer-acht.org>

31 files changed, 124 insertions, 62 deletions

diff --git a/hosts/bbx15-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/bbx15-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/bbx15-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/bbx15-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/cb3a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/cb3a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/cb3a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/cb3a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/cbxi4a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/cbxi4a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/cbxi4a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/cbxi4a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/cbxi4b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/cbxi4b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/cbxi4b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/cbxi4b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/ff2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/ff2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/ff2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/ff2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/ff2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/ff2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/ff2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/ff2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/ff4a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/ff4a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/ff4a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/ff4a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/jenkins-test-vm/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/jenkins-test-vm/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/jenkins-test-vm/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/jenkins-test-vm/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/jtk1a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/jtk1a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/jtk1a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/jtk1a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/odu3a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/odu3a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/odu3a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/odu3a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/odxu4-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/odxu4-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/odxu4-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/odxu4-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/odxu4b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/odxu4b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/odxu4b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/odxu4b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/odxu4c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/odxu4c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/odxu4c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/odxu4c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/opi2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/opi2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/opi2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/opi2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/opi2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/opi2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/opi2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/opi2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/opi2c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/opi2c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/opi2c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/opi2c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/profitbricks-build10-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build10-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/profitbricks-build10-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/profitbricks-build10-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/profitbricks-build11-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build11-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/profitbricks-build11-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/profitbricks-build11-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/profitbricks-build15-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build15-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/profitbricks-build15-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/profitbricks-build15-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/profitbricks-build2-i386/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build2-i386/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/profitbricks-build2-i386/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/profitbricks-build2-i386/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/profitbricks-build5-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build5-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/profitbricks-build5-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/profitbricks-build5-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/profitbricks-build6-i386/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build6-i386/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/profitbricks-build6-i386/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/profitbricks-build6-i386/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/rpi2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/rpi2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/rpi2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/rpi2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/rpi2c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/rpi2c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/rpi2c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/rpi2c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/wbd0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/wbd0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/wbd0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/wbd0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
diff --git a/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 27fd6445..9fbad7c5 100755
--- a/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -26,8 +26,10 @@ if [ -n "$BUILDUSERNAME" ] ; then
 	fi
 fi
 
-# temporarily disable disorderfs as we have problems properly unmounting it
-exit 0
+# use disorderfs on i386 only for now
+if [ "$(dpkg --print-architecture)" != "i386" ] ; then
+	exit 0
+fi
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then