[PATCH 2/2] sudo: Fail on the first error

[Anton Mikanovich <amikan@ilbers.de>]

The code execution inside sudo section should be stopped on the first
command failure because the next commands can cause incorrect behavior.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 meta/classes/deb-dl-dir.bbclass                   | 2 ++
 meta/classes/image-locales-extension.bbclass      | 1 +
 meta/classes/image.bbclass                        | 1 +
 meta/classes/rootfs.bbclass                       | 2 ++
 meta/classes/vm-img.bbclass                       | 1 +
 meta/classes/wic-img.bbclass                      | 1 +
 meta/recipes-devtools/buildchroot/buildchroot.inc | 1 +
 7 files changed, 9 insertions(+)

diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass
index 29bf45b..ffbff07 100644
--- a/meta/classes/deb-dl-dir.bbclass
+++ b/meta/classes/deb-dl-dir.bbclass
@@ -22,6 +22,7 @@ is_not_part_of_current_build() {
 
 debsrc_do_mounts() {
     sudo -s <<EOSUDO
+    set -e
     mkdir -p "${1}/deb-src"
     mountpoint -q "${1}/deb-src" || \
     mount --bind "${DEBSRCDIR}" "${1}/deb-src"
@@ -30,6 +31,7 @@ EOSUDO
 
 debsrc_undo_mounts() {
     sudo -s <<EOSUDO
+    set -e
     mkdir -p "${1}/deb-src"
     mountpoint -q "${1}/deb-src" && \
     umount -l "${1}/deb-src"
diff --git a/meta/classes/image-locales-extension.bbclass b/meta/classes/image-locales-extension.bbclass
index 0f0d0ca..25af540 100644
--- a/meta/classes/image-locales-extension.bbclass
+++ b/meta/classes/image-locales-extension.bbclass
@@ -59,6 +59,7 @@ __EOF__
 
     # Install configuration into image:
     sudo -E -s <<'EOSUDO'
+        set -e
         cat '${WORKDIR}/locale.gen' >> '${ROOTFSDIR}/etc/locale.gen'
         cat '${WORKDIR}/locale.default' > '${ROOTFSDIR}/etc/default/locale'
         cat '${WORKDIR}/locale.nopurge' > '${ROOTFSDIR}/etc/locale.nopurge'
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 95c14e5..ea49354 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -189,6 +189,7 @@ addtask deploy before do_build after do_image
 
 do_rootfs_finalize() {
     sudo -s <<'EOSUDO'
+        set -e
         test -e "${ROOTFSDIR}/chroot-setup.sh" && \
             "${ROOTFSDIR}/chroot-setup.sh" "cleanup" "${ROOTFSDIR}"
         rm -f "${ROOTFSDIR}/chroot-setup.sh"
diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
index e0604e0..6ecb39d 100644
--- a/meta/classes/rootfs.bbclass
+++ b/meta/classes/rootfs.bbclass
@@ -30,6 +30,7 @@ export LC_ALL = "C"
 rootfs_do_mounts[weight] = "3"
 rootfs_do_mounts() {
     sudo -s <<'EOSUDO'
+        set -e
         mountpoint -q '${ROOTFSDIR}/dev' || \
             mount --rbind /dev '${ROOTFSDIR}/dev'
         mount --make-rslave '${ROOTFSDIR}/dev'
@@ -80,6 +81,7 @@ ROOTFS_CONFIGURE_COMMAND += "rootfs_configure_isar_apt"
 rootfs_configure_isar_apt[weight] = "2"
 rootfs_configure_isar_apt() {
     sudo -s <<'EOSUDO'
+    set -e
 
     mkdir -p '${ROOTFSDIR}/etc/apt/sources.list.d'
     echo 'deb [trusted=yes] file:///isar-apt ${DEBDISTRONAME} main' > \
diff --git a/meta/classes/vm-img.bbclass b/meta/classes/vm-img.bbclass
index b230af2..c75a544 100644
--- a/meta/classes/vm-img.bbclass
+++ b/meta/classes/vm-img.bbclass
@@ -95,6 +95,7 @@ do_create_ova() {
     image_do_mounts
 
     sudo -Es chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} <<'EOSUDO'
+        set -e
         export DISK_SIZE_BYTES=$(qemu-img info -f vmdk "${VIRTUAL_MACHINE_DISK}" \
                                  | gawk 'match($0, /^virtual size:.*\(([0-9]+) bytes\)/, a) {print a[1]}')
         export DISK_UUID=$(uuidgen)
diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass
index 80ca5f7..7537a27 100644
--- a/meta/classes/wic-img.bbclass
+++ b/meta/classes/wic-img.bbclass
@@ -156,6 +156,7 @@ wic_do_mounts() {
     buildchroot_do_mounts
     sudo -s <<'EOSUDO'
         ( flock 9
+        set -e
         for dir in ${BBLAYERS} ${STAGING_DIR} ${SCRIPTSDIR} ${BITBAKEDIR}; do
             mkdir -p ${BUILDCHROOT_DIR}/$dir
             if ! mountpoint ${BUILDCHROOT_DIR}/$dir >/dev/null 2>&1; then
diff --git a/meta/recipes-devtools/buildchroot/buildchroot.inc b/meta/recipes-devtools/buildchroot/buildchroot.inc
index 726c7bb..6d9ced0 100644
--- a/meta/recipes-devtools/buildchroot/buildchroot.inc
+++ b/meta/recipes-devtools/buildchroot/buildchroot.inc
@@ -44,6 +44,7 @@ BUILDCHROOT_PREINSTALL_COMMON = " \
 
 rootfs_do_mounts_append() {
     sudo -s <<'EOSUDO'
+    set -e
     mkdir -p '${BUILDCHROOT_DIR}/downloads'
     mountpoint -q '${BUILDCHROOT_DIR}/downloads' || \
         mount --bind '${DL_DIR}' '${BUILDCHROOT_DIR}/downloads'
-- 
2.25.1