curtin-dev team mailing list archive

[Paride Legovini <paride.legovini@xxxxxxxxxxxxx>]

Paride Legovini has proposed merging ~legovini/curtin:curtainer-mask-zfs-services into curtin:master.

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

Requested reviews:
  curtin developers (curtin-dev)

For more details, see:
https://code.launchpad.net/~legovini/curtin/+git/curtin/+merge/385912
-- 
Your team curtin developers is requested to review the proposed merge of ~legovini/curtin:curtainer-mask-zfs-services into curtin:master.

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); }' \