diff options
| author | torben | 2018-10-24 10:28:50 +0200 |
|---|---|---|
| committer | torben | 2018-10-24 10:28:50 +0200 |
| commit | 574e52edd3443cd7a6d2744460428cce2db55192 (patch) | |
| tree | ea6a0d04a7fc7e8c58b2a6052a12ed1b46ec024f | |
| parent | Add intel resolution modul. Updating all libs. (diff) | |
| download | systemd-init-574e52edd3443cd7a6d2744460428cce2db55192.tar.gz systemd-init-574e52edd3443cd7a6d2744460428cce2db55192.tar.xz systemd-init-574e52edd3443cd7a6d2744460428cce2db55192.zip | |
Update bashlink for high level text-boxes with dialog.
| m--------- | modules.d/bashlink/bashlink | 0 | ||||
| -rwxr-xr-x | modules.d/dialog/dialog.sh | 4 | ||||
| -rwxr-xr-x | modules.d/dnbd-root-filesystem/hooks/update-boot-files.sh | 13 |
3 files changed, 11 insertions, 6 deletions
diff --git a/modules.d/bashlink/bashlink b/modules.d/bashlink/bashlink -Subproject f65a641ab96e3acf91686b3e494d279c27168f6 +Subproject f0d80a9612ca5a95b371f72382f81806f1064b5 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 |