From 2990cb8a625c51a68719c461a87e36fa7860cb1c Mon Sep 17 00:00:00 2001
From: act365 <gnuhub@qq.com>
Date: Wed, 6 Apr 2022 14:51:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=95=9C=E5=83=8F=E6=BA=90?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E4=BE=BF=E4=BA=8E=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=AE=9A=E4=B9=89=E9=95=9C=E5=83=8F=E6=BA=90=20auto?=
 =?UTF-8?q?=20commit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 3.ci.worker.sh                   |  3 +++
 isodvd/amd64.build.sh            | 18 +++++++++++++++++-
 isodvd/profiles/amd64.build.conf |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/3.ci.worker.sh b/3.ci.worker.sh
index d2314c5..fc6d18c 100755
--- a/3.ci.worker.sh
+++ b/3.ci.worker.sh
@@ -7,4 +7,7 @@ cd $CMD_PATH
 apt install simple-cdd -y
 cd isodvd
 rm -rf tmp/mirror/db/lockfile
+export atzlinux_debian_mirror_extra="https://apt.atzlinux.com/atzlinux"
+export atzlinux_debian_security_mirror="https://mirrors.huaweicloud.com/debian-security/ "
+export atzlinux_debian_mirror="https://mirrors.huaweicloud.com/debian/"
 ./amd64.build.sh
diff --git a/isodvd/amd64.build.sh b/isodvd/amd64.build.sh
index 13fcaca..81b2bc0 100755
--- a/isodvd/amd64.build.sh
+++ b/isodvd/amd64.build.sh
@@ -1 +1,17 @@
-build-simple-cdd --force-root --debug --dvd --proposed-updates --dist buster --locale zh_CN --keyboard us --security-mirror https://mirrors.huaweicloud.com/debian-security/ --debian-mirror https://mirrors.huaweicloud.com/debian/  -b amd64.build
+#!/usr/bin/env bash
+
+set -x
+
+export atzlinux_debian_mirror_extra=${atzlinux_debian_mirror_extra:="http://txy.atzlinux.com/atzlinux"}
+export atzlinux_debian_security_mirror=${atzlinux_debian_security_mirror:="https://mirrors.huaweicloud.com/debian-security/ "}
+export atzlinux_debian_mirror=${atzlinux_debian_mirror:="https://mirrors.huaweicloud.com/debian/"}
+
+build-simple-cdd --force-root \
+--debug  \
+--dvd \
+--dist buster \
+--locale zh_CN \
+--keyboard us  \
+--security-mirror ${atzlinux_debian_mirror_extra} \
+--debian-mirror ${atzlinux_debian_mirror}  \
+-b amd64.build
\ No newline at end of file
diff --git a/isodvd/profiles/amd64.build.conf b/isodvd/profiles/amd64.build.conf
index a8d5e33..a5e8574 100644
--- a/isodvd/profiles/amd64.build.conf
+++ b/isodvd/profiles/amd64.build.conf
@@ -1,6 +1,6 @@
 mirror_components="main contrib non-free"
 
-debian_mirror_extra="http://txy.atzlinux.com/atzlinux"
+debian_mirror_extra=${atzlinux_debian_mirror_extra}
 mirror_components_extra="main contrib non-free"
 keyring=/usr/share/keyrings/debian-archive-keyring.gpg,/etc/apt/trusted.gpg.d/atzlinux-archive-v10.gpg
 
-- 
Gitee