casper: use new approach to set trisquel ISOs image.
This commit is contained in:
parent
84d9adb581
commit
6f84cb8d7e
3 changed files with 30 additions and 18 deletions
|
|
@ -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
|
|
||||||
27
helpers/DATA/casper/set_trisquel_iso_suggestion.patch
Normal file
27
helpers/DATA/casper/set_trisquel_iso_suggestion.patch
Normal file
|
|
@ -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
|
||||||
|
;;
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
#
|
#
|
||||||
|
|
||||||
VERSION=16
|
VERSION=17
|
||||||
|
|
||||||
. ./config
|
. ./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/cut/cut -d: -f2- | cut/" -i scripts/casper-functions
|
||||||
sed "s/head -n1/sed -n 1p/" -i scripts/casper-functions
|
sed "s/head -n1/sed -n 1p/" -i scripts/casper-functions
|
||||||
|
|
||||||
#Remove ubuntu's net images load on empty livefs.
|
# Set trisquel isos as default suggestion.
|
||||||
patch -p1 < $DATA/remove_interactive_netmount.patch
|
patch --no-backup-if-mismatch -p1 < $DATA/set_trisquel_iso_suggestion.patch
|
||||||
|
|
||||||
changelog "Compiled for Trisquel"
|
changelog "Compiled for Trisquel"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue