From fa1f21e7e88320d489dc4d8249cd19f285fc7d57 Mon Sep 17 00:00:00 2001
From: act365 <gnuhub@qq.com>
Date: Wed, 6 Apr 2022 12:05:30 +0800
Subject: [PATCH 1/8]  auto commit

---
 isodvd/profiles/amd64.build.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/isodvd/profiles/amd64.build.conf b/isodvd/profiles/amd64.build.conf
index a8d5e33..05f96a9 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="https://www.atzlinux.com/atzlinux"
 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


From 97e7c2bb2abf1388196775cfef7f7f38e2ff506a Mon Sep 17 00:00:00 2001
From: act365 <gnuhub@qq.com>
Date: Wed, 6 Apr 2022 12:29:19 +0800
Subject: [PATCH 2/8]  auto commit

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

diff --git a/3.ci.worker.sh b/3.ci.worker.sh
index d2314c5..ed546bc 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://www.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..2e5fe24 100755
--- a/isodvd/amd64.build.sh
+++ b/isodvd/amd64.build.sh
@@ -1 +1,6 @@
-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
+
+export atzlinux_debian_mirror_extra=${atzlinux_debian_mirror_extra:"https://www.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 --proposed-updates --dist buster --locale zh_CN --keyboard us --security-mirror ${atzlinux_debian_mirror_extra} --debian-mirror ${atzlinux_debian_mirror}  -b amd64.build
diff --git a/isodvd/profiles/amd64.build.conf b/isodvd/profiles/amd64.build.conf
index 05f96a9..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="https://www.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


From 35852405b5753403ae36d095a074e4ee80fec0cc Mon Sep 17 00:00:00 2001
From: act365 <gnuhub@qq.com>
Date: Wed, 6 Apr 2022 12:30:07 +0800
Subject: [PATCH 3/8]  auto commit

---
 isodvd/amd64.build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/isodvd/amd64.build.sh b/isodvd/amd64.build.sh
index 2e5fe24..97e13f7 100755
--- a/isodvd/amd64.build.sh
+++ b/isodvd/amd64.build.sh
@@ -1,4 +1,5 @@
 
+set -x
 export atzlinux_debian_mirror_extra=${atzlinux_debian_mirror_extra:"https://www.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/"}
-- 
Gitee


From 6b9b7ab80ad084d234068fec9267c7a147411e97 Mon Sep 17 00:00:00 2001
From: act365 <gnuhub@qq.com>
Date: Wed, 6 Apr 2022 12:33:09 +0800
Subject: [PATCH 4/8]  auto commit

---
 isodvd/amd64.build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/isodvd/amd64.build.sh b/isodvd/amd64.build.sh
index 97e13f7..b21dde2 100755
--- a/isodvd/amd64.build.sh
+++ b/isodvd/amd64.build.sh
@@ -1,7 +1,7 @@
 
 set -x
-export atzlinux_debian_mirror_extra=${atzlinux_debian_mirror_extra:"https://www.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/"}
+export atzlinux_debian_mirror_extra=${atzlinux_debian_mirror_extra:="https://www.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 --proposed-updates --dist buster --locale zh_CN --keyboard us --security-mirror ${atzlinux_debian_mirror_extra} --debian-mirror ${atzlinux_debian_mirror}  -b amd64.build
-- 
Gitee


From 08a28ede14a175e056099e09b332811a02bfa0cb Mon Sep 17 00:00:00 2001
From: act365 <gnuhub@qq.com>
Date: Wed, 6 Apr 2022 12:38:42 +0800
Subject: [PATCH 5/8]  auto commit

---
 isodvd/amd64.build.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/isodvd/amd64.build.sh b/isodvd/amd64.build.sh
index b21dde2..24f0518 100755
--- a/isodvd/amd64.build.sh
+++ b/isodvd/amd64.build.sh
@@ -1,7 +1,18 @@
+#!/ussr/bin/env bash
 
 set -x
-export atzlinux_debian_mirror_extra=${atzlinux_debian_mirror_extra:="https://www.atzlinux.com/atzlinux"}
+
+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 --proposed-updates --dist buster --locale zh_CN --keyboard us --security-mirror ${atzlinux_debian_mirror_extra} --debian-mirror ${atzlinux_debian_mirror}  -b amd64.build
+build-simple-cdd --force-root \
+--debug  \
+--dvd \
+--proposed-updates \
+--dist buster \
+--locale zh_CN \
+--keyboard us  \
+--security-mirror ${atzlinux_debian_mirror_extra} \
+--debian-mirror ${atzlinux_debian_mirror}  \
+-b amd64.build
-- 
Gitee


From 97e900ef511d163d8327686b842b8b144740f6a7 Mon Sep 17 00:00:00 2001
From: act365 <gnuhub@qq.com>
Date: Wed, 6 Apr 2022 12:43:39 +0800
Subject: [PATCH 6/8]  auto commit

---
 isodvd/amd64.build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/isodvd/amd64.build.sh b/isodvd/amd64.build.sh
index 24f0518..450aec9 100755
--- a/isodvd/amd64.build.sh
+++ b/isodvd/amd64.build.sh
@@ -1,4 +1,4 @@
-#!/ussr/bin/env bash
+#!/usr/bin/env bash
 
 set -x
 
-- 
Gitee


From 4fb5ddf39c4cba095681c97abbcd15639ed82771 Mon Sep 17 00:00:00 2001
From: act365 <gnuhub@qq.com>
Date: Wed, 6 Apr 2022 13:07:31 +0800
Subject: [PATCH 7/8]  auto commit

---
 3.ci.worker.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3.ci.worker.sh b/3.ci.worker.sh
index ed546bc..fc6d18c 100755
--- a/3.ci.worker.sh
+++ b/3.ci.worker.sh
@@ -7,7 +7,7 @@ cd $CMD_PATH
 apt install simple-cdd -y
 cd isodvd
 rm -rf tmp/mirror/db/lockfile
-export atzlinux_debian_mirror_extra="https://www.atzlinux.com/atzlinux"
+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
-- 
Gitee


From 0c98dfcc00b2ba6ed66a9c8518e2f785c8aa9f4e Mon Sep 17 00:00:00 2001
From: act365 <gnuhub@qq.com>
Date: Wed, 6 Apr 2022 13:18:13 +0800
Subject: [PATCH 8/8]  auto commit

---
 isodvd/amd64.build.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/isodvd/amd64.build.sh b/isodvd/amd64.build.sh
index 450aec9..620b786 100755
--- a/isodvd/amd64.build.sh
+++ b/isodvd/amd64.build.sh
@@ -9,7 +9,6 @@ export atzlinux_debian_mirror=${atzlinux_debian_mirror:="https://mirrors.huaweic
 build-simple-cdd --force-root \
 --debug  \
 --dvd \
---proposed-updates \
 --dist buster \
 --locale zh_CN \
 --keyboard us  \
-- 
Gitee