[Pkg-zfsonlinux-devel] Bug#849969: Bug#849969: root zpool broken on Debian stretch

[Lukas Wunner]

On Sat, Jan 28, 2017 at 02:53:01AM +0800, Aron Xu wrote:
> I've committed some more cherry-picks from upstream about dracut, as in
> https://anonscm.debian.org/git/pkg-zfsonlinux/zfs.git/commit/?id=146eee208ab3a35cecdb65a3edafd82e3130ff44
> 
> and your fixes about systemd unit files, as in
> https://anonscm.debian.org/git/pkg-zfsonlinux/zfs.git/commit/?id=58907cc6bf85f30ebcf577a97e1e6877f264f65b
> 
> Can you test whether these fixes work for you? I'd like to make an
> upload for dracut issue and the Linux 4.9 compatibility stuff.

Thanks a lot Aron, I'm happy to confirm that the tip of the master branch
(94b699fe4012) boots and shuts down correctly on a ZFS root with dracut
and kernel 4.9.


There are two unrelated glitches though:

(1) systemd complains on boot:

    "systemd[2234]: zfs-share.service: Failed at step EXEC spawning
     /usr/sbin/rm: No such file or directory"

    This was introduced by b83d293b8d8d ("Change utilities path (bindir)
    to /usr/sbin (Closes: #832938)").  Adding Eric Desrochers to cc.
    I think fumbling bindir to point to /usr/sbin isn't a good idea,
    instead the three Python scripts should be moved to /usr/sbin in a
    debhelper override.

(2) If the umask is set to 077 the build fails.  Attached is a patch to
    fix this.  I didn't notice this earlier as I changed my default
    umask only recently.

Thanks,

Lukas
-------------- next part --------------
>From bd7090a913d1561971734060d38e60b1cb50e6e5 Mon Sep 17 00:00:00 2001
From: Lukas Wunner <lukas at wunner.de>
Date: Sat, 28 Jan 2017 21:37:06 +0100
Subject: [PATCH] Fix build breakage caused by nonstandard umask

If the user has set umask 077 instead of the standard 022,
dpkg-buildpackage fails with:

chmod -x debian/tmp/etc/zfs/zfs-functions
chmod: debian/tmp/etc/zfs/zfs-functions: new permissions are rw-r-xr-x, not rw-r--r--
debian/rules:64: recipe for target 'override_dh_auto_install' failed

Signed-off-by: Lukas Wunner <lukas at wunner.de>
---
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 6dfb8c1..3b9015f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -111,8 +111,8 @@ override_dh_auto_install:
 		rm $${i}; \
 	done
 
-	chmod -x $(CURDIR)/debian/tmp/etc/zfs/zfs-functions
-	chmod -x $(CURDIR)/debian/tmp/etc/default/zfs
+	chmod a-x $(CURDIR)/debian/tmp/etc/zfs/zfs-functions
+	chmod a-x $(CURDIR)/debian/tmp/etc/default/zfs
 
 override_dh_dkms:
 	dh_dkms -V $(VERSION)
-- 
2.11.0