From f41f9f314803ca2834ea2f15f8d5105ab7a2a5ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Tue, 8 Nov 2022 07:15:29 +0000
Subject: [PATCH] choose-mirror: fix static codename release
---
.../choose-mirror/rev_choose-mirror-bin.templates-in.patch | 2 +-
helpers/make-choose-mirror | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/helpers/DATA/choose-mirror/rev_choose-mirror-bin.templates-in.patch b/helpers/DATA/choose-mirror/rev_choose-mirror-bin.templates-in.patch
index 2638a729b..8976574dc 100644
--- a/helpers/DATA/choose-mirror/rev_choose-mirror-bin.templates-in.patch
+++ b/helpers/DATA/choose-mirror/rev_choose-mirror-bin.templates-in.patch
@@ -5,7 +5,7 @@ diff -ru choose-mirror-2.78ubuntu7+10.0trisquel3/debian/choose-mirror-bin.templa
Type: select
Choices-C: ${CHOICES-C}
Choices: ${CHOICES}
--Default: nabia
+-Default: _CODENAME_
-Description: Trisquel version to install:
- In Trisquel, this question is never asked, and is only for preseeding.
- Caveat emptor.
diff --git a/helpers/make-choose-mirror b/helpers/make-choose-mirror
index 6953a8528..c295ca9af 100644
--- a/helpers/make-choose-mirror
+++ b/helpers/make-choose-mirror
@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=4
+VERSION=5
EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
REPOKEY=648ACFD622F3D138
NETINST=true
@@ -32,6 +32,7 @@ sed -i '/oldstable/d;
/unstable/d;' mirrors.h
sed -i "s|stable|$CODENAME|" mirrors.h
+replace "_CODENAME_" "$CODENAME"
replace "deb.debian.org" "archive.trisquel.org" .
replace "debian.org" "trisquel.org" .
replace "Debian" "Trisquel" .
--
GitLab