summaryrefslogtreecommitdiffstats
path: root/builder
diff options
context:
space:
mode:
authorjandob2016-03-22 14:20:21 +0100
committerjandob2016-03-22 14:20:21 +0100
commit1544f77f979a1896d156312624457e5edd2d40d4 (patch)
tree3eaa49137dbe2e70750c69ff07f54fc29050d2b1 /builder
parentupdate rebash (diff)
downloadsystemd-init-1544f77f979a1896d156312624457e5edd2d40d4.tar.gz
systemd-init-1544f77f979a1896d156312624457e5edd2d40d4.tar.xz
systemd-init-1544f77f979a1896d156312624457e5edd2d40d4.zip
add traceback to hook errors that lead to an emergency shell
Diffstat (limited to 'builder')
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh1
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh4
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh1
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/fetch-config.sh1
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh1
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/mount-root-device.sh1
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/prepare-root-partition.sh1
7 files changed, 8 insertions, 2 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 1c86190c..ba66ddc3 100755
--- a/builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh
+++ b/builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh
@@ -21,6 +21,7 @@ mkdir --parents "${new_systemd_system_unit_path}/sysinit.target.wants"
}
exceptions.catch
{
+ logging.error "$exceptions_last_traceback"
emergency_shell "error in ${BASH_SOURCE[0]}"
}
# region vim modline
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 f0e54d4c..2c44a5fe 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
@@ -51,8 +51,8 @@ done
}
exceptions.catch
{
- logging.warn "Failed to copy a dracut service file to NEWROOT, " \
- "maybe they were already installed in the template system."
+ logging.error "$exceptions_last_traceback"
+ emergency_shell "error in ${BASH_SOURCE[0]}"
}
# 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 1e9106b1..e09fb173 100755
--- a/builder/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh
+++ b/builder/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh
@@ -16,6 +16,7 @@ cp "/etc/openslx" "${NEWROOT}${SLX_CONFIGURATION_LOCATION}"
}
exceptions.catch
{
+ logging.error "$exceptions_last_traceback"
emergency_shell "error in ${BASH_SOURCE[0]}"
}
# region vim modline
diff --git a/builder/dnbd3-rootfs/hooks/fetch-config.sh b/builder/dnbd3-rootfs/hooks/fetch-config.sh
index e038369c..09df76eb 100755
--- a/builder/dnbd3-rootfs/hooks/fetch-config.sh
+++ b/builder/dnbd3-rootfs/hooks/fetch-config.sh
@@ -41,6 +41,7 @@ fi
}
exceptions.catch
{
+ logging.error "$exceptions_last_traceback"
emergency_shell "error in ${BASH_SOURCE[0]}"
}
# region vim modline
diff --git a/builder/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh b/builder/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh
index a7f5dbc4..c3875fcb 100755
--- a/builder/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh
+++ b/builder/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh
@@ -22,6 +22,7 @@ fi
}
exceptions.catch
{
+ logging.error "$exceptions_last_traceback"
emergency_shell "error in ${BASH_SOURCE[0]}"
}
# region vim modline
diff --git a/builder/dnbd3-rootfs/hooks/mount-root-device.sh b/builder/dnbd3-rootfs/hooks/mount-root-device.sh
index d78a209d..519f8730 100755
--- a/builder/dnbd3-rootfs/hooks/mount-root-device.sh
+++ b/builder/dnbd3-rootfs/hooks/mount-root-device.sh
@@ -22,6 +22,7 @@ fi
}
exceptions.catch
{
+ logging.error "$exceptions_last_traceback"
emergency_shell "error in ${BASH_SOURCE[0]}"
}
# region vim modline
diff --git a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
index d051a250..8aee2b6b 100755
--- a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
+++ b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
@@ -151,6 +151,7 @@ device-add-write-layer "root" "$read_only_partition" "$writable_device" \
}
exceptions.catch
{
+ logging.error "$exceptions_last_traceback"
emergency_shell "error in ${BASH_SOURCE[0]}"
}
# region vim modline