From e770efe64fa374b047195de79e4ca98ba4aa47d0 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 1 Sep 2023 15:42:00 -0400
Subject: [PATCH] Remove implicit /debian from mirror

---
 buildiso.sh | 6 +++---
 buildpxe.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/buildiso.sh b/buildiso.sh
index 9879e0f..576c162 100755
--- a/buildiso.sh
+++ b/buildiso.sh
@@ -29,7 +29,7 @@ show_help() {
     echo -e "   -o: Create the ISO as <output_filename> instead of the default."
     echo -e "   -u: Change 'deploy' user to a new username."
     echo -e "   -c: Change CPU architecture to a new architecture [x86_64/aarch64]."
-    echo -e "   -m: Change the mirror server (default 'https://ftp.debian.org')."
+    echo -e "   -m: Change the mirror server (default 'https://ftp.debian.org/debian')."
     echo -e "   -a: Preserve live-build artifacts."
     echo -e "   -k: Preserve live-build config."
 }
@@ -101,7 +101,7 @@ if [[ -z ${deployusername} ]]; then
     deployusername="deploy"
 fi
 if [[ -z ${mirror_server} ]]; then
-    mirror_server="https://ftp.debian.org"
+    mirror_server="https://ftp.debian.org/debian"
 fi
 
 mkdir -p artifacts/lb
@@ -116,7 +116,7 @@ echo "Initializing config..."
 lb config \
        --distribution bullseye \
        --archive-areas "main contrib non-free" \
-       --mirror-bootstrap "${mirror_server}/debian" \
+       --mirror-bootstrap "${mirror_server}" \
        --mirror-chroot-security "http://security.debian.org/debian-security" \
        --debconf-frontend readline \
        --apt-recommends false \
diff --git a/buildpxe.sh b/buildpxe.sh
index 1a38aad..06797e4 100755
--- a/buildpxe.sh
+++ b/buildpxe.sh
@@ -29,7 +29,7 @@ show_help() {
     echo -e "   -h: Display this help message."
     echo -e "   -o: Create the PXE images under <outputdirectory> instead of the default."
     echo -e "   -u: Change 'deploy' user to a new username."
-    echo -e "   -m: Change the mirror server (default 'https://ftp.debian.org')."
+    echo -e "   -m: Change the mirror server (default 'https://ftp.debian.org/debian')."
     echo -e "   -a: Preserve live-build artifacts (passed through to buildiso.sh)."
     echo -e "   -k: Preserve live-build config (passed through to buildiso.sh)."
     echo -e "   -i: Preserve live-build ISO image."