Commit a1712e11 authored by Matt Smith's avatar Matt Smith

setup-disk, setup-timezone: improved messages

parent 5af57fcb
...@@ -371,9 +371,9 @@ show_disk_info() { ...@@ -371,9 +371,9 @@ show_disk_info() {
confirm_erase() { confirm_erase() {
local answer= local answer=
echo "WARNING: the following disks will be erased:" echo "WARNING: The following disk(s) will be erased:"
show_disk_info $@ show_disk_info $@
echo -n "WARNING: Erase the above disks and continue? [y/N]: " echo -n "WARNING: Erase the above disk(s) and continue? [y/N]: "
read answer read answer
case "$answer" in case "$answer" in
...@@ -640,7 +640,7 @@ setup_root() { ...@@ -640,7 +640,7 @@ setup_root() {
swapoff -a swapoff -a
echo "" echo ""
echo "Installation is done. Please reboot." echo "Installation is complete. Please reboot."
} }
native_disk_install_lvm() { native_disk_install_lvm() {
...@@ -737,13 +737,14 @@ You can select between 'sys' or 'data'. ...@@ -737,13 +737,14 @@ You can select between 'sys' or 'data'.
This mode is a traditional disk install. A /boot partition, / (root) and This mode is a traditional disk install. A /boot partition, / (root) and
swap will be created. swap will be created.
Use this mode for development boxes, desktops, virtual servers etc. Use this mode for development boxes, desktops, virtual servers, etc.
* data * data
This mode let you use your disk for data-only. The system itself will run This mode uses your disk(s) for data-only. The system itself will run
from tmpfs (RAM). from tmpfs (RAM).
Use this mode is you want use disk only for mailspool, databases, logs etc. Use this mode if you only want to use the disk(s) for a mailspool,
databases, logs, etc.
__EOF__ __EOF__
} }
...@@ -869,15 +870,15 @@ fi ...@@ -869,15 +870,15 @@ fi
if [ -n "$diskdevs" ] && [ -z "$DISK_MODE" ]; then if [ -n "$diskdevs" ] && [ -z "$DISK_MODE" ]; then
answer= answer=
disk_or_disks="disk" disk_is_or_disks_are="disk is"
it_them="it" it_them="it"
if [ $# -gt 1 ]; then if [ $# -gt 1 ]; then
disk_plural="disks" disk_is_or_disks_are="disks are"
it_them="them" it_them="them"
fi fi
while true; do while true; do
echo "The following $disk_or_disks are selected:" echo "The following $disk_is_or_disks_are selected:"
show_disk_info $diskdevs show_disk_info $diskdevs
echon "How would you like to use $it_them? ('sys', 'data' or '?' for help) [?] " echon "How would you like to use $it_them? ('sys', 'data' or '?' for help) [?] "
default_read answer '?' default_read answer '?'
......
...@@ -37,7 +37,7 @@ zonepath=$(cat /etc/TZ 2>/dev/null) ...@@ -37,7 +37,7 @@ zonepath=$(cat /etc/TZ 2>/dev/null)
[ -z "$zonepath" ] && zonepath="UTC" [ -z "$zonepath" ] && zonepath="UTC"
while true; do while true; do
echo -n "What timezone are you in? ('?' for list) [$zonepath] " echo -n "Which timezone are you in? ('?' for list) [$zonepath] "
default_read zonepath "$zonepath" default_read zonepath "$zonepath"
case "$zonepath" in case "$zonepath" in
"") continue;; "") continue;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment