summaryrefslogtreecommitdiffstats
path: root/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
diff options
context:
space:
mode:
authorjandob2016-03-01 23:52:52 +0100
committerjandob2016-03-01 23:52:52 +0100
commita6770f8adaec3dc35444baa4b76b7d53d991e686 (patch)
treefc2f180a5661aa980ce77f7feb9c684541df9c71 /builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
parentrework exception handling inside hooks (diff)
downloadsystemd-init-a6770f8adaec3dc35444baa4b76b7d53d991e686.tar.gz
systemd-init-a6770f8adaec3dc35444baa4b76b7d53d991e686.tar.xz
systemd-init-a6770f8adaec3dc35444baa4b76b7d53d991e686.zip
fix
Diffstat (limited to 'builder/dnbd3-rootfs/hooks/prepare-root-partition.sh')
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/prepare-root-partition.sh10
1 files changed, 7 insertions, 3 deletions
diff --git a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
index 4d3281de..d5c9d1d1 100755
--- a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
+++ b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
@@ -6,8 +6,8 @@ core.import exceptions
core.import utils
core.import logging
# endregion
-exceptions.activate
-( # subshell for variable scoping
+exceptions.try
+{
logging.set_commands_level debug
logging.set_level debug
@@ -127,7 +127,11 @@ logging.info "Using writable device $writable_device, persistency: $persistent"
device-add-write-layer "root" "$read_only_partition" "$writable_device" \
"$persistent"
-); result=$?; exceptions.deactivate; [[ $result == 0 ]] || exit 1
+}
+exceptions.catch
+{
+ emergency_shell "error in ${BASH_SOURCE[0]}"
+}
# region vim modline
# vim: set tabstop=4 shiftwidth=4 expandtab: