diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-03-03 10:58:01 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-03-03 11:00:14 +0000 |
| commit | 576a6e772384fcc9ce73a3628ae86483567e8eb4 (patch) | |
| tree | 98daded67e267df58ff29081eafa4bd94cf9a166 /setup-alpine.in | |
| parent | 77b181bc8f9268357ae3d2b41e10ff722d51b217 (diff) | |
| download | alpine-conf-576a6e772384fcc9ce73a3628ae86483567e8eb4.tar.bz2 alpine-conf-576a6e772384fcc9ce73a3628ae86483567e8eb4.tar.xz | |
setup-timezone: minor fixes
- ask for timezone after root password (before we start syslog)
- rephrase the questinos and fix input prompt to be on same line
Diffstat (limited to 'setup-alpine.in')
| -rw-r--r-- | setup-alpine.in | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/setup-alpine.in b/setup-alpine.in index aeab41a..a14c1a6 100644 --- a/setup-alpine.in +++ b/setup-alpine.in @@ -43,6 +43,9 @@ grep '^iface.*dhcp' $ROOT/etc/network/interfaces > /dev/null ||\ # set root password [ -z "$NOCOMMIT" ] && while ! passwd ; do echo "Please retry." ; done +# pick timezone +$PREFIX/sbin/setup-timezone + rc-update -q add networking boot rc-update -q add acpid rc-update -q add cron @@ -67,16 +70,5 @@ _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 -printf "Setup internet apk repositories? [y/N]?" -default_read setuprepos "n" - -if [ $setuprepos == "Y" ] || [ $setuprepos == "y" ]; then - $PREFIX/sbin/setup-apkrepos -fi +$PREFIX/sbin/setup-apkrepos -printf "Change timezone (default is UTC)? [y/N]?" -default_read setuptz "n" - -if [ $setuptz == "Y" ] || [ $setuptz == "y" ]; then - $PREFIX/sbin/setup-timezone -fi |