change subshell pattern for variable scoping

9 files changed, 9 insertions, 9 deletions

diff --git a/builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh b/builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh
index 4c97102f..3cb821cb 100755
--- a/builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh
+++ b/builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh
@@ -20,7 +20,7 @@ mkdir --parents "${new_systemd_system_unit_path}/sysinit.target.wants"
 ln --symbolic '../dnbd3root.service' \
     "${new_systemd_system_unit_path}/sysinit.target.wants/dnbd3root.service"
 
-) || exit $?
+); [[ $? == 1 ]] && exit 1
 exceptions.deactivate
 # region vim modline
 # vim: set tabstop=4 shiftwidth=4 expandtab:
diff --git a/builder/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh b/builder/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh
index 35b5e3e7..0b292351 100755
--- a/builder/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh
+++ b/builder/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh
@@ -40,7 +40,7 @@ cp --recursive --no-target-directory "$temporary_directory_path" /run/initramfs
 umount "$temporary_directory_path"
 rm --dir "$temporary_directory_path"
 
-) || exit $?
+); [[ $? == 1 ]] && exit 1
 exceptions.deactivate
 # region vim modline
 
diff --git a/builder/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh b/builder/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh
index 514a797e..4f868353 100755
--- a/builder/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh
+++ b/builder/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh
@@ -15,7 +15,7 @@ source "/etc/openslx"
 mkdir --parents "${NEWROOT}${SLX_CONFIGURATION_LOCATION}"
 cp "/etc/openslx" "${NEWROOT}${SLX_CONFIGURATION_LOCATION}"
 
-) || exit $?
+); [[ $? == 1 ]] && exit 1
 exceptions.deactivate
 # region vim modline
 # vim: set tabstop=4 shiftwidth=4 expandtab:
diff --git a/builder/dnbd3-rootfs/hooks/enable-sysrq.sh b/builder/dnbd3-rootfs/hooks/enable-sysrq.sh
index 7fe42c31..63b07463 100755
--- a/builder/dnbd3-rootfs/hooks/enable-sysrq.sh
+++ b/builder/dnbd3-rootfs/hooks/enable-sysrq.sh
@@ -14,7 +14,7 @@ logging.set_level debug
 # Enables magic sysrq kernel supported key combinations.
 echo 1 > /proc/sys/kernel/sysrq
 
-) || exit $?
+); [[ $? == 1 ]] && exit 1
 exceptions.deactivate
 # region vim modline
 # vim: set tabstop=4 shiftwidth=4 expandtab:
diff --git a/builder/dnbd3-rootfs/hooks/fetch-config.sh b/builder/dnbd3-rootfs/hooks/fetch-config.sh
index c9f026de..354bbcc6 100755
--- a/builder/dnbd3-rootfs/hooks/fetch-config.sh
+++ b/builder/dnbd3-rootfs/hooks/fetch-config.sh
@@ -37,7 +37,7 @@ if [[ ! -e "/etc/openslx" ]]; then
     exit 1
 fi
 
-) || exit $?
+); [[ $? == 1 ]] && exit 1
 exceptions.deactivate
 # region vim modline
 # vim: set tabstop=4 shiftwidth=4 expandtab:
diff --git a/builder/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh b/builder/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh
index 300adc47..e026d586 100755
--- a/builder/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh
+++ b/builder/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh
@@ -26,7 +26,7 @@ if ! insmod "${DNBD3_MOD_PATH}"; then
     exit 1
 fi
 
-) || exit $?
+); [[ $? == 1 ]] && exit 1
 exceptions.deactivate
 # region vim modline
 # vim: set tabstop=4 shiftwidth=4 expandtab:
diff --git a/builder/dnbd3-rootfs/hooks/mount-root-device.sh b/builder/dnbd3-rootfs/hooks/mount-root-device.sh
index 2c59c0f3..9553fbca 100755
--- a/builder/dnbd3-rootfs/hooks/mount-root-device.sh
+++ b/builder/dnbd3-rootfs/hooks/mount-root-device.sh
@@ -18,7 +18,7 @@ if ! getarg root=; then
     genfstab "$NEWROOT" 2>/dev/null > "$NEWROOT/etc/fstab"
 fi
 
-) || exit $?
+); [[ $? == 1 ]] && exit 1
 exceptions.deactivate
 # region vim modline
 # vim: set tabstop=4 shiftwidth=4 expandtab:
diff --git a/builder/dnbd3-rootfs/hooks/prepare-kernel-command-line-parameter.sh b/builder/dnbd3-rootfs/hooks/prepare-kernel-command-line-parameter.sh
index 4c388178..9e6dab46 100755
--- a/builder/dnbd3-rootfs/hooks/prepare-kernel-command-line-parameter.sh
+++ b/builder/dnbd3-rootfs/hooks/prepare-kernel-command-line-parameter.sh
@@ -66,7 +66,7 @@ fi
 echo '-----------------------Dracut-Kernel-Command-Line:----------------------'
 cat /proc/cmdline
 echo '------------------------------------------------------------------------'
-) || exit $?
+); [[ $? == 1 ]] && exit 1
 # region vim modline
 
 # vim: set tabstop=4 shiftwidth=4 expandtab:
diff --git a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
index 6101272c..5f6c67a5 100755
--- a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
+++ b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
@@ -128,7 +128,7 @@ logging.info "Using writable device $writable_device, persistency: $persistent"
 device-add-write-layer "root" "$read_only_partition" "$writable_device" \
     "$persistent"
 
-) || exit $?
+); [[ $? == 1 ]] && exit 1
 exceptions.deactivate
 # region vim modline