From 574e52edd3443cd7a6d2744460428cce2db55192 Mon Sep 17 00:00:00 2001 From: torben Date: Wed, 24 Oct 2018 10:28:50 +0200 Subject: Update bashlink for high level text-boxes with dialog. --- modules.d/bashlink/bashlink | 2 +- modules.d/dialog/dialog.sh | 4 +++- modules.d/dnbd-root-filesystem/hooks/update-boot-files.sh | 13 ++++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/modules.d/bashlink/bashlink b/modules.d/bashlink/bashlink index f65a641a..f0d80a96 160000 --- a/modules.d/bashlink/bashlink +++ b/modules.d/bashlink/bashlink @@ -1 +1 @@ -Subproject commit f65a641ab96e3acf91686b3e494d279c27168f61 +Subproject commit f0d80a9612ca5a95b371f72382f81806f1064b52 diff --git a/modules.d/dialog/dialog.sh b/modules.d/dialog/dialog.sh index 40060692..41d51cd4 100755 --- a/modules.d/dialog/dialog.sh +++ b/modules.d/dialog/dialog.sh @@ -7,7 +7,9 @@ type emergency_shell >/dev/null 2>&1 || \ bl.exception.try # Quiet systemd logs. kill -55 1 - bl.ui.input_password >/tmp/dialog-data.txt + bl.ui.input_text RZ-Login >/tmp/dialog-data.txt + echo >>/tmp/dialog-data.txt + bl.ui.input_password >>/tmp/dialog-data.txt # Unquiet systemd logs. kill -54 1 bl.exception.catch_single { diff --git a/modules.d/dnbd-root-filesystem/hooks/update-boot-files.sh b/modules.d/dnbd-root-filesystem/hooks/update-boot-files.sh index e2fa3a72..dbe382ab 100755 --- a/modules.d/dnbd-root-filesystem/hooks/update-boot-files.sh +++ b/modules.d/dnbd-root-filesystem/hooks/update-boot-files.sh @@ -121,7 +121,8 @@ bl.exception.try { local boot_partition_identifier for boot_partition_identifier in "${SLX_INITIAL_BOOT_PARTITION_IDENTIFIER[@]}"; do local device_partition_path="$boot_partition_identifier" - if fdisk --list | grep "$boot_partition_identifier" &>/dev/null; then + if fdisk --list | grep "$boot_partition_identifier" &>/dev/null + then device_partition_path="$( fdisk --list | \ grep "$boot_partition_identifier" | \ @@ -133,22 +134,24 @@ bl.exception.try { umount /mnt else bl.logging.warn \ - Failed to mount $device_partition_path, checking filesystem. + Failed to mount $device_partition_path, checking \ + filesystem. ! $SLX_WRITABLE_DEVICE_STORAGE_FILESYSTEM_CHECK_COMMAND \ "$device_partition_path" if mount "$device_partition_path" /mnt &>/dev/null; then umount /mnt else bl.logging.warn \ - Mounting $device_partition_path, still failing. Creating new \ - filesystem on device. + Mounting $device_partition_path, still failing. \ + Creating new filesystem on device. $SLX_WRITABLE_DEVICE_STORAGE_FILESYSTEM_CREATE_COMMAND \ "$device_partition_path" if mount "$device_partition_path" /mnt &>/dev/null; then umount /mnt else bl.logging.warn \ - Mounting $device_partition_path, still failing, giving up. + Mounting $device_partition_path, still \ + failing, giving up. fi fi fi -- cgit v1.2.3-55-g7522