From c8a1c6ed56cea4e0a99615e9e71a481f67e925d8 Mon Sep 17 00:00:00 2001
From: Zenithal <i@zenithal.me>
Date: Tue, 28 Feb 2023 01:21:21 +0800
Subject: [PATCH] mirroz-help: debian: add non-free-firmware

Ref to https://github.com/mirrorz-org/mirrorz-help/commit/39ed73761af1df2258cd6eb8cbc92f79c3c3ac21
Also remove notes on other non-tuna mirrors

Closes https://github.com/tuna/issues/issues/1658
---
 help/_posts/1970-01-01-debian.md | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/help/_posts/1970-01-01-debian.md b/help/_posts/1970-01-01-debian.md
index 46b7a71..49b88f8 100644
--- a/help/_posts/1970-01-01-debian.md
+++ b/help/_posts/1970-01-01-debian.md
@@ -89,20 +89,20 @@ Debian Buster 以上版本默认支持 HTTPS 源。如果遇到无法拉取 HTTP
 {% raw %}
 <script id="template-1" type="x-tmpl-markup">
 # 默认注释了源码镜像以提高 apt update 速度，如有需要可自行取消注释
-deb {{http_protocol}}{{mirror}}/ {{release_name}} main contrib non-free
-{{enable_source}}deb-src {{http_protocol}}{{mirror}}/ {{release_name}} main contrib non-free
+deb {{http_protocol}}{{mirror}}/ {{release_name}} main contrib non-free non-free-firmware
+{{enable_source}}deb-src {{http_protocol}}{{mirror}}/ {{release_name}} main contrib non-free non-free-firmware
 
-{{is_sid}}deb {{http_protocol}}{{mirror}}/ {{release_name}}-updates main contrib non-free
-{{is_sid}}{{enable_source}}deb-src {{http_protocol}}{{mirror}}/ {{release_name}}-updates main contrib non-free
+{{is_sid}}deb {{http_protocol}}{{mirror}}/ {{release_name}}-updates main contrib non-free non-free-firmware
+{{is_sid}}{{enable_source}}deb-src {{http_protocol}}{{mirror}}/ {{release_name}}-updates main contrib non-free non-free-firmware
 
-{{is_sid}}{{has_backports}}deb {{http_protocol}}{{mirror}}/ {{release_name}}-backports main contrib non-free
-{{is_sid}}{{has_backports}}{{enable_source}}deb-src {{http_protocol}}{{mirror}}/ {{release_name}}-backports main contrib non-free
+{{is_sid}}{{has_backports}}deb {{http_protocol}}{{mirror}}/ {{release_name}}-backports main contrib non-free non-free-firmware
+{{is_sid}}{{has_backports}}{{enable_source}}deb-src {{http_protocol}}{{mirror}}/ {{release_name}}-backports main contrib non-free non-free-firmware
 
-{{security_mirror}}{{is_sid}}deb {{http_protocol}}{{mirror}}-security {{release_name}}{{security}} main contrib non-free
-{{security_mirror}}{{is_sid}}{{enable_source}}deb-src {{http_protocol}}{{mirror}}-security {{release_name}}{{security}} main contrib non-free
+{{security_mirror}}{{is_sid}}deb {{http_protocol}}{{mirror}}-security {{release_name}}{{security}} main contrib non-free non-free-firmware
+{{security_mirror}}{{is_sid}}{{enable_source}}deb-src {{http_protocol}}{{mirror}}-security {{release_name}}{{security}} main contrib non-free non-free-firmware
 
-{{security_official}}{{is_sid}}deb {{http_protocol}}security.debian.org/debian-security {{release_name}}{{security}} main contrib non-free
-{{security_official}}{{is_sid}}{{enable_source}}deb-src {{http_protocol}}security.debian.org/debian-security {{release_name}}{{security}} main contrib non-free
+{{security_official}}{{is_sid}}deb {{http_protocol}}security.debian.org/debian-security {{release_name}}{{security}} main contrib non-free non-free-firmware
+{{security_official}}{{is_sid}}{{enable_source}}deb-src {{http_protocol}}security.debian.org/debian-security {{release_name}}{{security}} main contrib non-free non-free-firmware
 </script>
 {% endraw %}
 
@@ -114,8 +114,6 @@ deb {{http_protocol}}{{mirror}}/ {{release_name}} main contrib non-free
 </pre>
 
 
-为了方便快速配置，此处一并附上了 debian-security 的配置，一般来说，镜像站会同时提供 debian-security，截至写文档时，DNUI、HIT 与 NYIST 未提供该镜像，为了更准确的信息您可以前往 [Debian Security 帮助](/help/debian-security) 确认。
-
 不过，一般来说，为了更及时地获得安全更新，不推荐使用镜像站安全更新软件源，因为镜像站往往有同步延迟。参考 https://www.debian.org/security/faq.en.html#mirror
 
 > The purpose of security.debian.org is to make security updates available as quickly and easily as possible.