diff options
author | Jonathan Bauer | 2018-03-15 10:55:12 +0100 |
---|---|---|
committer | Jonathan Bauer | 2018-03-15 10:55:12 +0100 |
commit | d3da8784f5ab47fed0cf81a79af40c2b7abcc1c9 (patch) | |
tree | 5bc5587ca8d1b4a51c9d8da8ab32750fe178d828 | |
parent | no exit in sourced scripts round2wq (diff) | |
download | systemd-init-d3da8784f5ab47fed0cf81a79af40c2b7abcc1c9.tar.gz systemd-init-d3da8784f5ab47fed0cf81a79af40c2b7abcc1c9.tar.xz systemd-init-d3da8784f5ab47fed0cf81a79af40c2b7abcc1c9.zip |
[openslx_tmp_format] only warn if sanity checks fails and do not spawn an emergency_shell since this is to be considered a non-critical error.
-rwxr-xr-x | builder/modules.d/openslx_tmp_format/scripts/openslx_tmp_format.sh | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/builder/modules.d/openslx_tmp_format/scripts/openslx_tmp_format.sh b/builder/modules.d/openslx_tmp_format/scripts/openslx_tmp_format.sh index 00aee627..ef34b6c0 100755 --- a/builder/modules.d/openslx_tmp_format/scripts/openslx_tmp_format.sh +++ b/builder/modules.d/openslx_tmp_format/scripts/openslx_tmp_format.sh @@ -8,29 +8,36 @@ command -v emergency_shell >/dev/null || source /lib/dracut-lib.sh . /etc/openslx -if [ -z "${SLX_TMP_PARTITION_IDENTIFIER}" ]; then - emergency_shell "[${BASH_SOURCE[0]}] \ - SLX_TMP_PARTITION_IDENTIFIER not set!" -fi +# If it is not set, assume the functionality is unwanted +[ -z "${SLX_TMP_PARTITION_IDENTIFIER}" ] && return 0 + SLX_TMP_PARTITION_DEVICE="/dev/disk/by-partlabel/${SLX_TMP_PARTITION_IDENTIFIER}" if [ ! -b "$(readlink -f ${SLX_TMP_PARTITION_DEVICE})" ]; then - emergency_shell "[${BASH_SOURCE[0]}] \ + warn "[${BASH_SOURCE[0]}] \ '${SLX_TMP_PARTITION_DEVICE}' does not point to a block device" + return 1 fi -if [ -z "${SLX_TMP_PARTITION_FILESYSTEM_CREATE_COMMAND}" ] || \ - ! command -v "${SLX_TMP_PARTITION_FILESYSTEM_CREATE_COMMAND%%\ *}" >/dev/null; then +# Since a partition identifier is set and this module was built +# assume that the partition should always be formatted. +if [ -z "${SLX_TMP_PARTITION_FILESYSTEM_CREATE_COMMAND}" ] || + ! command -v "${SLX_TMP_PARTITION_FILESYSTEM_CREATE_COMMAND%%\ *}" >/dev/null; then + warn "[${BASH_SOURCE[0]}] \ + '${SLX_TMP_PARTITION_FILESYSTEM_CREATE_COMMAND%%\ *}' invalid. Using fallbacks..." + # Fallbacks if command -v mkfs.xfs >/dev/null; then SLX_TMP_PARTITION_FILESYSTEM_CREATE_COMMAND="mkfs.xfs -f" elif command -v mkfs.ext4 >/dev/null; then SLX_TMP_PARTITION_FILESYSTEM_CREATE_COMMAND="mkfs.ext4 -F" else - emergency_shell "[${BASH_SOURCE[0]}] No suitable mkfs command found!" + warn "[${BASH_SOURCE[0]}] No suitable mkfs command found! Skipping..." + return 1 fi fi if ! ${SLX_TMP_PARTITION_FILESYSTEM_CREATE_COMMAND} "${SLX_TMP_PARTITION_DEVICE}"; then - emergency_shell "[${BASH_SOURCE[0]}] \ + warn "[${BASH_SOURCE[0]}] \ Failed to format '${SLX_TMP_PARTITION_DEVICE}' using: \ ${SLX_TMP_PARTITION_FILESYSTEM_CREATE_COMMAND}" + return 1 fi |