Merge ~paride/curtin:curtainer-mask-zfs-services into curtin:master

[Paride Legovini]

curtainer: fail is masking of zfs-mount or zfs-share fails

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:aa5e7cb3db32a42f765d021672c6929239735a2e
https://jenkins.ubuntu.com/server/job/curtin-ci/150/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/150/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/150/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/150/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/150/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/150//rebuild

review: Approve (continuous-integration)

[Richard Harding (rharding)]

TY

review: Approve

diff --git a/tools/curtainer b/tools/curtainer
index 34ccfb6..a6fdc1b 100755
--- a/tools/curtainer
+++ b/tools/curtainer
@@ -166,8 +166,8 @@ main() {
     # the zfs-mount and zfs-share services as /dev/zfs is missing. We do
     # not actually need ZFS to work in the container, so the problem can be
     # worked around by masking the services before the package is installed.
-    inside "$name" systemctl mask zfs-mount
-    inside "$name" systemctl mask zfs-share
+    inside "$name" systemctl mask zfs-mount || fail "failed to mask zfs-mount"
+    inside "$name" systemctl mask zfs-share || fail "failed to mask zfs-share"
 
     if $proposed; then
         mirror=$(inside $name awk '$1 == "deb" { print $2; exit(0); }' \