summaryrefslogtreecommitdiff
path: root/setup-disk.in
diff options
context:
space:
mode:
Diffstat (limited to 'setup-disk.in')
-rw-r--r--setup-disk.in13
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