From a99c4dbfc85530e811f530c26c576f9185d94011 Mon Sep 17 00:00:00 2001 From: "Brent, Yang Bohan" Date: Mon, 25 Mar 2019 13:46:10 +0800 Subject: [PATCH] Update netboot.sh --- netboot.sh | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/netboot.sh b/netboot.sh index f0fb866..4e0f442 100644 --- a/netboot.sh +++ b/netboot.sh @@ -121,35 +121,35 @@ done case "$DEBNETB_COUNTRY" in CN) - DEBNETB_PROTO=${PROTO:-https} - DEBNETB_HOST=${HOST:-chinanet.mirrors.ustc.edu.cn} - DEBNETB_TIME_ZONE=${TIME_ZONE:-Asia/Shanghai} - DEBNETB_NTP=${NTP:-cn.ntp.org.cn} - DEBNETB_SECURITY=${SECURITY:-true} - DEBNETB_DNS=${DNS:-156.154.70.5 156.154.71.5} + DEBNETB_PROTO=${DEBNETB_PROTO:-https} + DEBNETB_HOST=${DEBNETB_HOST:-chinanet.mirrors.ustc.edu.cn} + DEBNETB_TIME_ZONE=${DEBNETB_TIME_ZONE:-Asia/Shanghai} + DEBNETB_NTP=${DEBNETB_NTP:-cn.ntp.org.cn} + DEBNETB_SECURITY=${DEBNETB_SECURITY:-true} + DEBNETB_DNS=${DEBNETB_DNS:-156.154.70.5 156.154.71.5} esac -DEBNETB_COUNTRY=${COUNTRY:-US} -DEBNETB_PROTO=${PROTO:-http} -DEBNETB_HOST=${HOST:-deb.debian.org} -DEBNETB_DIR=${DIR:-/debian} +DEBNETB_COUNTRY=${DEBNETB_COUNTRY:-US} +DEBNETB_PROTO=${DEBNETB_PROTO:-http} +DEBNETB_HOST=${DEBNETB_HOST:-deb.debian.org} +DEBNETB_DIR=${DEBNETB_DIR:-/debian} if [ -z "$DEBNETB_ARCH" ]; then DEBNETB_ARCH=$(dpkg --print-architecture) fi -DEBNETB_SUITE=${SUITE:-stretch} -DEBNETB_ADMIN=${ADMIN:-debian} -DEBNETB_TIME_ZONE=${TIME_ZONE:-UTC} -DEBNETB_NTP=${NTP:-pool.ntp.org} -DEBNETB_UPGRADE=${UPGRADE:-full-upgrade} -DEBNETB_DNS=${DNS:-8.8.8.8 8.8.4.4} -DEBNETB_FILESYS=${FILESYS:-ext4} -DEBNETB_DISKCRYPTO=${DISKCRYPTO:-regular} +DEBNETB_SUITE=${DEBNETB_SUITE:-stretch} +DEBNETB_ADMIN=${DEBNETB_ADMIN:-debian} +DEBNETB_TIME_ZONE=${DEBNETB_TIME_ZONE:-UTC} +DEBNETB_NTP=${DEBNETB_NTP:-pool.ntp.org} +DEBNETB_UPGRADE=${DEBNETB_UPGRADE:-full-upgrade} +DEBNETB_DNS=${DEBNETB_DNS:-8.8.8.8 8.8.4.4} +DEBNETB_FILESYS=${DEBNETB_FILESYS:-ext4} +DEBNETB_DISKCRYPTO=${DEBNETB_DISKCRYPTO:-regular} if [ -z "$DEBNETB_SECURITY" ]; then DEBNETB_SECURITY=http://security.debian.org/debian-security else if [ "$DEBNETB_SECURITY" = true ]; then - DEBNETB_SECURITY=$DEBNETB_PROTO://$DEBNETB_HOST${DIR%/*}/debian-security + DEBNETB_SECURITY=$DEBNETB_PROTO://$DEBNETB_HOST${DEBNETB_DIR%/*}/debian-security fi fi