summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-04-11 12:43:27 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-04-11 12:43:27 +0000
commitebb858227b0f815bf9a4d300bdda6162d9c6a965 (patch)
tree71ed854c2632aa28b803f9414a1e85a8bb35928a
parentecce23e204fcc97efa8abc738507ff2a6c41fbaa (diff)
downloadalpine-conf-ebb858227b0f815bf9a4d300bdda6162d9c6a965.tar.bz2
alpine-conf-ebb858227b0f815bf9a4d300bdda6162d9c6a965.tar.xz
setup-disk: use the term 'sys' instead of 'root'.
It makes more sense to talk about a system disk and data disk.
-rw-r--r--setup-disk.in19
1 files changed, 13 insertions, 6 deletions
diff --git a/setup-disk.in b/setup-disk.in
index f9436fc..caf253a 100644
--- a/setup-disk.in
+++ b/setup-disk.in
@@ -731,9 +731,9 @@ __EOF__
diskmode_help() {
cat <<__EOF__
-You can select between 'root' or 'data'.
+You can select between 'sys' or 'data'.
-* root
+* sys
This mode is a traditional disk install. A /boot partition, / (root) and
swap will be created.
@@ -869,14 +869,21 @@ fi
if [ -n "$diskdevs" ] && [ -z "$DISK_MODE" ]; then
answer=
+ disk_or_disks="disk"
+ it_them="it"
+ if [ $# -gt 1 ]; then
+ disk_plural="disks"
+ it_them="them"
+ fi
+
while true; do
- echo "The following disks are selected:"
+ echo "The following $disk_or_disks are selected:"
show_disk_info $diskdevs
- echon "How would you like to use them? ('root', 'data' or '?' for help) [?] "
+ echon "How would you like to use $it_them? ('sys', 'data' or '?' for help) [?] "
default_read answer '?'
case "$answer" in
'?') diskmode_help;;
- root|data) break;;
+ sys|data) break;;
esac
done
DISK_MODE="$answer"
@@ -891,7 +898,7 @@ dmesg -n1
# native disk install
case "$DISK_MODE" in
-root) native_disk_install$USE_LVM $diskdevs;;
+sys) native_disk_install$USE_LVM $diskdevs;;
data) data_only_disk_install$USE_LVM $diskdevs;;
*) echo "Not a valid install mode: $DISK_MODE" >&2; exit 1;;
esac