infong/debi
1
0
Fork 0
mirror of https://github.com/bohanyang/debi.git synced 2026-09-26 22:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Bohan Yang
2019-07-31 17:37:56 +08:00
parent 15722bb919
commit 52750863fe
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+4 -5
View File
@@ -22,7 +22,7 @@ This script is used to re-install VPS to **Debian 9 (stretch) or 10 (buster)** w
- `--ip` - `--ip`
- `--netmask` - `--netmask`
- `--gateway` - `--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` - `--hostname debian`
- `--ssh-password` - `--ssh-password`
- `--ssh-keys` - `--ssh-keys`
@@ -34,7 +34,7 @@ This script is used to re-install VPS to **Debian 9 (stretch) or 10 (buster)** w
- `--username debian` - `--username debian`
- `--password` - `--password`
- `--timezone UTC` https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List - `--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` - `--skip-part`
- `--disk` - `--disk`
- `--part` - `--part`
@@ -51,9 +51,9 @@ This script is used to re-install VPS to **Debian 9 (stretch) or 10 (buster)** w
### `china` ### `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` - `--protocol https`
- `--mirror chinanet.mirrors.ustc.edu.cn` - `--mirror mirrors.aliyun.com`
- `--security true` - `--security true`
- `--timezone Asia/Shanghai` - `--timezone Asia/Shanghai`
- `--ntp cn.ntp.org.cn` - `--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` - `--protocol https`
- `--mirror cdn-aws.deb.debian.org` - `--mirror cdn-aws.deb.debian.org`
- `--security true` - `--security true`
- `--ntp time.cloudflare.com`
netboot.sh
+4 -5
View File
@@ -157,9 +157,9 @@ done
if [ -n "$DEBI_PRESET" ]; then if [ -n "$DEBI_PRESET" ]; then
case "$DEBI_PRESET" in case "$DEBI_PRESET" in
china) 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_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_TIMEZONE=${DEBI_TIMEZONE:-Asia/Shanghai}
DEBI_NTP=${DEBI_NTP:-cn.ntp.org.cn} DEBI_NTP=${DEBI_NTP:-cn.ntp.org.cn}
DEBI_SECURITY=${DEBI_SECURITY:-true} DEBI_SECURITY=${DEBI_SECURITY:-true}
@@ -167,7 +167,6 @@ if [ -n "$DEBI_PRESET" ]; then
cloud) cloud)
DEBI_PROTOCOL=${DEBI_PROTOCOL:-https} DEBI_PROTOCOL=${DEBI_PROTOCOL:-https}
DEBI_MIRROR=${DEBI_MIRROR:-cdn-aws.deb.debian.org} DEBI_MIRROR=${DEBI_MIRROR:-cdn-aws.deb.debian.org}
DEBI_NTP=${DEBI_NTP:-time.cloudflare.com}
DEBI_SECURITY=${DEBI_SECURITY:-true} DEBI_SECURITY=${DEBI_SECURITY:-true}
;; ;;
*) *)
@@ -206,7 +205,7 @@ d-i keyboard-configuration/xkb-keymap select us
d-i netcfg/choose_interface select auto d-i netcfg/choose_interface select auto
EOF 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 if [ -n "$DEBI_IP" ]; then
echo 'd-i netcfg/disable_autoconfig boolean true' | $save_preseed echo 'd-i netcfg/disable_autoconfig boolean true' | $save_preseed
@@ -326,7 +325,7 @@ EOF
fi fi
DEBI_TIMEZONE=${DEBI_TIMEZONE:-UTC} DEBI_TIMEZONE=${DEBI_TIMEZONE:-UTC}
DEBI_NTP=${DEBI_NTP:-pool.ntp.org} DEBI_NTP=${DEBI_NTP:-0.debian.pool.ntp.org}
$save_preseed << EOF $save_preseed << EOF