diff --git a/helpers/DATA/ubiquity/99trisquel b/helpers/DATA/ubiquity/99trisquel index b8a434a..9972b27 100755 --- a/helpers/DATA/ubiquity/99trisquel +++ b/helpers/DATA/ubiquity/99trisquel @@ -71,7 +71,7 @@ Signed-By: ${SIGNED_BY} EOF # Keep the legacy file and the pipeline temp file as a single breadcrumb line -: > "$SAVETO" -printf '%s\n' "$MSG" > "$file" +printf '%s\n' "$MSG" > "$SAVETO" +: > "$file" exit 0 diff --git a/helpers/DATA/ubiquity/patch_changes/007-setup_deb822_mirrors_setup.patch b/helpers/DATA/ubiquity/patch_changes/007-setup_deb822_mirrors_setup.patch index 8780e82..6fde74a 100644 --- a/helpers/DATA/ubiquity/patch_changes/007-setup_deb822_mirrors_setup.patch +++ b/helpers/DATA/ubiquity/patch_changes/007-setup_deb822_mirrors_setup.patch @@ -2,20 +2,17 @@ diff --git a/d-i/source/apt-setup/generators/01setup b/d-i/source/apt-setup/gene index b4b0ea40..c4933286 100755 --- a/d-i/source/apt-setup/generators/01setup +++ b/d-i/source/apt-setup/generators/01setup -@@ -5,6 +5,25 @@ set -e +@@ -5,6 +5,22 @@ set -e file="$1" +# Ensure ROOT default; allow override +: "${ROOT:=/target}" + -+# If Deb822 sources already exist in the target, keep legacy minimal and clean. ++# If Deb822 sources already exist in the target, don't emit anything, let 99trisquel to take over. +if [ -d "$ROOT/etc/apt/sources.list.d" ] && ls "$ROOT/etc/apt/sources.list.d/"*.sources >/dev/null 2>&1; then -+ msg="# Trisquel sources have moved to /etc/apt/sources.list.d/trisquel.sources" -+ # Temp file consumed by the generators pipeline (must exist, but keep it clean) -+ printf '%s\n' "$msg" > "$file" -+ # Ensure the target legacy file exists and contains only the breadcrumb -+ printf '%s\n' "$msg" > "$ROOT/etc/apt/sources.list" ++ : > "$file" ++ exit 0 +else + # Fallback: add old file as comments (tolerant if missing) + if [ -r "$ROOT/etc/apt/sources.list" ]; then diff --git a/helpers/make-ubiquity b/helpers/make-ubiquity index cdce2ae..09cfb5d 100644 --- a/helpers/make-ubiquity +++ b/helpers/make-ubiquity @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=43.1 +VERSION=44 . ./config