diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2022-07-15 12:04:48 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2022-07-15 12:08:20 +0200 |
| commit | bf973ddd2ec5b5555fd03e1aac6fe6e4d1e60642 (patch) | |
| tree | 604d2794753f2cfaa91934ef35a01fb855a457f3 | |
| parent | 43417136c2e4375d4e1c9cd9c6f02e5b85f74583 (diff) | |
| download | alpine-conf-bf973ddd2ec5b5555fd03e1aac6fe6e4d1e60642.zip | |
setup-disk: fix hang with UEFI and interactive 'none'
Fix a hang that happens with interactively selecting 'none' with efi
mode.
Fixes commit 851247d96340 (setup-disk: calculate size of ESP parition
for grub)
| -rw-r--r-- | setup-disk.in | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/setup-disk.in b/setup-disk.in index 0f00de9..c479f97 100644 --- a/setup-disk.in +++ b/setup-disk.in @@ -1545,13 +1545,12 @@ if [ $# -gt 0 ]; then else ask_disk "Which disk(s) would you like to use? (or '?' for help or 'none')" \ diskselect_help $disks - if [ "$resp" != none ]; then - for i in $resp; do - diskdevs="$diskdevs /dev/$i" - done - else - DISK_MODE="none" + if [ "$resp" = "none" ]; then + exit 0 fi + for i in $resp; do + diskdevs="$diskdevs /dev/$i" + done fi if [ -n "$diskdevs" ] && [ -z "$DISK_MODE" ]; then @@ -1616,7 +1615,7 @@ if [ $# -gt 1 ]; then USE_RAID=1 fi -dmesg -n1 +$MOCK dmesg -n1 if [ -n "$USE_LVM" ] && ! grep -w -q device-mapper /proc/misc; then modprobe dm-mod |