From 6f84cb8d7e70f0a3977bddc20c7fb54c5759a797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Tue, 21 Feb 2023 21:09:02 +0000
Subject: [PATCH] casper: use new approach to set trisquel ISOs image.
---
.../casper/remove_interactive_netmount.patch | 15 -----------
.../casper/set_trisquel_iso_suggestion.patch | 27 +++++++++++++++++++
helpers/make-casper | 6 ++---
3 files changed, 30 insertions(+), 18 deletions(-)
delete mode 100644 helpers/DATA/casper/remove_interactive_netmount.patch
create mode 100644 helpers/DATA/casper/set_trisquel_iso_suggestion.patch
diff --git a/helpers/DATA/casper/remove_interactive_netmount.patch b/helpers/DATA/casper/remove_interactive_netmount.patch
deleted file mode 100644
index fe2dbb55..00000000
--- a/helpers/DATA/casper/remove_interactive_netmount.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/scripts/casper 2022-05-30 09:40:38.000000000 -0500
-+++ b/scripts/casper 2023-02-13 23:47:27.515797105 -0600
-@@ -955,12 +955,6 @@
- sleep 1
- i="$(($i + 1))"
- done
--
-- if [ -z "${livefs_root}" ]; then
-- if do_interactive_netmount ; then
-- livefs_root="${mountpoint}"
-- fi
-- fi
- fi
-
- if [ -z "${livefs_root}" ]; then
diff --git a/helpers/DATA/casper/set_trisquel_iso_suggestion.patch b/helpers/DATA/casper/set_trisquel_iso_suggestion.patch
new file mode 100644
index 00000000..116f99c1
--- /dev/null
+++ b/helpers/DATA/casper/set_trisquel_iso_suggestion.patch
@@ -0,0 +1,27 @@
+--- a/scripts/casper 2023-02-13 23:53:18.908768968 -0600
++++ b/scripts/casper 2023-02-21 03:28:55.176581755 -0600
+@@ -376,18 +376,18 @@
+ # maybe make livecd-rootfs embed something in the casper initrd?
+ case $PRETTY_NAME in
+ *development*)
+- server_url=http://cdimage.ubuntu.com/ubuntu-server/daily-live/current/$UBUNTU_CODENAME-live-server-$DPKG_ARCH.iso
+- desktop_url=http://cdimage.ubuntu.com/daily-live/current/$UBUNTU_CODENAME-desktop-$DPKG_ARCH.iso
++ server_url=""
++ desktop_url=""
+ ;;
+ *)
+ case $DPKG_ARCH in
+ amd64)
+- server_url=https://releases.ubuntu.com/$UBUNTU_CODENAME/ubuntu-$VERSION_ID-live-server-$DPKG_ARCH.iso
+- desktop_url=https://releases.ubuntu.com/$UBUNTU_CODENAME/ubuntu-$VERSION_ID-desktop-$DPKG_ARCH.iso
++ server_url=http://cdimage.trisquel.org/trisquel-images/${ID}-netinst_${VERSION_ID}_${DPKG_ARCH}.iso
++ desktop_url=http://cdimage.trisquel.org/trisquel-images/${ID}_${VERSION_ID}_${DPKG_ARCH}.iso
+ ;;
+ *)
+- server_url=http://cdimage.ubuntu.com/releases/$UBUNTU_CODENAME/release/ubuntu-$VERSION_ID-live-server-$DPKG_ARCH.iso
+- desktop_url=http://cdimage.ubuntu.com/releases/$UBUNTU_CODENAME/release/ubuntu-$VERSION_ID-desktop-$DPKG_ARCH.iso
++ server_url=http://cdimage.trisquel.org/trisquel-images/${ID}-netinst_${VERSION_ID}_${DPKG_ARCH}.iso
++ desktop_url=http://cdimage.trisquel.org/trisquel-images/${ID}_${VERSION_ID}_${DPKG_ARCH}.iso
+ ;;
+ esac
+ ;;
diff --git a/helpers/make-casper b/helpers/make-casper
index a6b43ca7..5fc44534 100644
--- a/helpers/make-casper
+++ b/helpers/make-casper
@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=16
+VERSION=17
. ./config
@@ -43,8 +43,8 @@ sed 's/Depends:/Depends: localechooser-data,\n/' -i debian/control
sed "s/cut/cut -d: -f2- | cut/" -i scripts/casper-functions
sed "s/head -n1/sed -n 1p/" -i scripts/casper-functions
-#Remove ubuntu's net images load on empty livefs.
-patch -p1 < $DATA/remove_interactive_netmount.patch
+# Set trisquel isos as default suggestion.
+patch --no-backup-if-mismatch -p1 < $DATA/set_trisquel_iso_suggestion.patch
changelog "Compiled for Trisquel"
--
GitLab