diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-06-06 09:06:49 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-06-06 09:12:57 +0000 |
| commit | 55bc788b99002e596ef95afb393cb0fa9ecff647 (patch) | |
| tree | 7a5dc76b8c8b6292305762df86371b420f20d9e6 | |
| parent | 66f08eb368d7e7dfcd739fb04aae2d0c04482ec2 (diff) | |
| download | alpine-conf-55bc788b99002e596ef95afb393cb0fa9ecff647.tar.bz2 alpine-conf-55bc788b99002e596ef95afb393cb0fa9ecff647.tar.xz | |
setup-alpine: Use 'none' as default disk
ref #674
| -rw-r--r-- | setup-alpine.in | 4 | ||||
| -rw-r--r-- | setup-disk.in | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/setup-alpine.in b/setup-alpine.in index fb40e8a..a246ca0 100644 --- a/setup-alpine.in +++ b/setup-alpine.in @@ -72,5 +72,7 @@ _hn=${_hn%%.*} sed -i -e "s/^127\.0\.0\.1.*/127.0.0.1\t${_hn}.${_dn:-$(get_fqdn)} ${_hn} localhost.localdomain localhost/" /etc/hosts $PREFIX/sbin/setup-apkrepos -$PREFIX/sbin/setup-disk -q + +DEFAULT_DISK=none \ + $PREFIX/sbin/setup-disk -q diff --git a/setup-disk.in b/setup-disk.in index 947ba40..9d073ec 100644 --- a/setup-disk.in +++ b/setup-disk.in @@ -781,12 +781,13 @@ ask_disk() { local i= shift 2 answer= + local default_disk=${DEFAULT_DISK:-$1} while ! all_in_list "$answer" $@ "none" "abort"; do echo "Available disks are:" show_disk_info "$@" - echon "$prompt [$1] " - default_read answer $1 + echon "$prompt [$default_disk] " + default_read answer $default_disk case "$answer" in 'abort') exit 0;; 'none') return 0;; |