From 52750863fed85fb76735677d94a1a516162fa615 Mon Sep 17 00:00:00 2001 From: Bohan Yang Date: Wed, 31 Jul 2019 17:37:56 +0800 Subject: [PATCH] Update --- README.md | 9 ++++----- netboot.sh | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 815a2e3..bb437ec 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ This script is used to re-install VPS to **Debian 9 (stretch) or 10 (buster)** w - `--ip` - `--netmask` - `--gateway` - - `--ns "1.1.1.1 1.0.0.1 8.8.8.8"` + - `--ns "8.8.8.8 8.8.4.4"` - `--hostname debian` - `--ssh-password` - `--ssh-keys` @@ -34,7 +34,7 @@ This script is used to re-install VPS to **Debian 9 (stretch) or 10 (buster)** w - `--username debian` - `--password` - `--timezone UTC` https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List - - `--ntp pool.ntp.org` + - `--ntp 0.debian.pool.ntp.org` - `--skip-part` - `--disk` - `--part` @@ -51,9 +51,9 @@ This script is used to re-install VPS to **Debian 9 (stretch) or 10 (buster)** w ### `china` - - `--ns "156.154.70.5 156.154.71.5 8.8.8.8"` + - `--ns "156.154.70.5 156.154.71.5"` - `--protocol https` - - `--mirror chinanet.mirrors.ustc.edu.cn` + - `--mirror mirrors.aliyun.com` - `--security true` - `--timezone Asia/Shanghai` - `--ntp cn.ntp.org.cn` @@ -63,4 +63,3 @@ This script is used to re-install VPS to **Debian 9 (stretch) or 10 (buster)** w - `--protocol https` - `--mirror cdn-aws.deb.debian.org` - `--security true` - - `--ntp time.cloudflare.com` diff --git a/netboot.sh b/netboot.sh index 55d16a0..bb3b57d 100644 --- a/netboot.sh +++ b/netboot.sh @@ -157,9 +157,9 @@ done if [ -n "$DEBI_PRESET" ]; then case "$DEBI_PRESET" in china) - DEBI_NS=${DEBI_NS:-156.154.70.5 156.154.71.5 8.8.8.8} + DEBI_NS=${DEBI_NS:-156.154.70.5 156.154.71.5} DEBI_PROTOCOL=${DEBI_PROTOCOL:-https} - DEBI_MIRROR=${DEBI_MIRROR:-chinanet.mirrors.ustc.edu.cn} + DEBI_MIRROR=${DEBI_MIRROR:-mirrors.aliyun.com} DEBI_TIMEZONE=${DEBI_TIMEZONE:-Asia/Shanghai} DEBI_NTP=${DEBI_NTP:-cn.ntp.org.cn} DEBI_SECURITY=${DEBI_SECURITY:-true} @@ -167,7 +167,6 @@ if [ -n "$DEBI_PRESET" ]; then cloud) DEBI_PROTOCOL=${DEBI_PROTOCOL:-https} DEBI_MIRROR=${DEBI_MIRROR:-cdn-aws.deb.debian.org} - DEBI_NTP=${DEBI_NTP:-time.cloudflare.com} DEBI_SECURITY=${DEBI_SECURITY:-true} ;; *) @@ -206,7 +205,7 @@ d-i keyboard-configuration/xkb-keymap select us d-i netcfg/choose_interface select auto EOF -DEBI_NS=${DEBI_NS:-1.1.1.1 1.0.0.1 8.8.8.8} +DEBI_NS=${DEBI_NS:-8.8.8.8 8.8.4.4} if [ -n "$DEBI_IP" ]; then echo 'd-i netcfg/disable_autoconfig boolean true' | $save_preseed @@ -326,7 +325,7 @@ EOF fi DEBI_TIMEZONE=${DEBI_TIMEZONE:-UTC} -DEBI_NTP=${DEBI_NTP:-pool.ntp.org} +DEBI_NTP=${DEBI_NTP:-0.debian.pool.ntp.org} $save_preseed << EOF