From f26f08c8345eefe5463f515af5ec623165f305be Mon Sep 17 00:00:00 2001 From: manuel Date: Wed, 10 Jan 2024 11:48:42 -0100 Subject: [PATCH] update calamares files --- calamares/{ => sources-debian}/sources-final | 0 calamares/sources-devuan/sources-final | 35 ++++++++++++++++++++ calamares/sources-devuan/sources-media | 25 ++++++++++++++ debian-32/build.sh | 2 +- debian-64/build.sh | 2 +- debian-arm64/build.sh | 2 +- devuan-32/build.sh | 2 +- devuan-64/build.sh | 2 +- devuan-arm64/build.sh | 2 +- 9 files changed, 66 insertions(+), 6 deletions(-) rename calamares/{ => sources-debian}/sources-final (100%) create mode 100755 calamares/sources-devuan/sources-final create mode 100755 calamares/sources-devuan/sources-media diff --git a/calamares/sources-final b/calamares/sources-debian/sources-final similarity index 100% rename from calamares/sources-final rename to calamares/sources-debian/sources-final diff --git a/calamares/sources-devuan/sources-final b/calamares/sources-devuan/sources-final new file mode 100755 index 000000000..10e01bcf1 --- /dev/null +++ b/calamares/sources-devuan/sources-final @@ -0,0 +1,35 @@ +#!/bin/sh +# +# Writes the final sources.list file +# + +CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") +RELEASE="daedalus" + +cat << EOF > $CHROOT/etc/apt/sources.list +# This system was installed using PeppermintOS removable media +# (e.g. netinst, live or single CD). The matching "deb cdrom" +# entries were removed at the end of the installation process. +# For information about how to configure apt package sources, +# see the sources.list(5) manual. + +# Main Repo - main contribnon-free non-free-firmware +deb http://deb.devuan.org/merged daedalus main contrib non-free non-free-firmware +#deb-src http://deb.devuan.org/merged daedalus main contrib non-free non-free-firmware + +# Security Repo - main contribnon-free non-free-firmware +#deb http://deb.devuan.org/merged daedalus-security main contrib non-free non-free-firmware +#deb-src http://deb.devuan.org/merged daedalus-security main contrib non-free non-free-firmware + +# Updates Repo - main contribnon-free non-free-firmware +#deb http://deb.devuan.org/merged daedalus-updates main contrib non-free non-free-firmware +#deb-src http://deb.devuan.org/merged daedalus-updates main contrib non-free non-free-firmware + +# daedalus-backports, previously on backports.debian.org +#deb http://deb.devuan.org/merged daedalus-backports main contrib non-free non-free-firmware +#deb-src http://deb.devuan.org/merged daedalus-backports main contrib non-free non-free-firmware + + +EOF + +exit 0 diff --git a/calamares/sources-devuan/sources-media b/calamares/sources-devuan/sources-media new file mode 100755 index 000000000..4bbe529d5 --- /dev/null +++ b/calamares/sources-devuan/sources-media @@ -0,0 +1,25 @@ +#!/bin/sh + +CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") +MEDIUM_PATH="/run/live/medium" +RELEASE="daedalus" + +if [ "$1" = "-u" ]; then + umount $CHROOT/$MEDIUM_PATH + rm $CHROOT/etc/apt/sources.list.d/debian-live-media.list + chroot $CHROOT apt-get update + exit 0 +fi + +# Remove the base sources, we will configure sources in a later phase +rm -f $CHROOT/etc/apt/sources.list.d/base.list + +mkdir -p $CHROOT/$MEDIUM_PATH +mount --bind $MEDIUM_PATH $CHROOT/$MEDIUM_PATH +echo "deb [trusted=yes] file:$MEDIUM_PATH $RELEASE main" > $CHROOT/etc/apt/sources.list.d/debian-live-media.list +chroot $CHROOT apt-get update +# Attempt safest way to remove cruft +rmdir $CHROOT/run/live/medium +rmdir $CHROOT/run/live + +exit 0 diff --git a/debian-32/build.sh b/debian-32/build.sh index f70d0d211..613ab8195 100755 --- a/debian-32/build.sh +++ b/debian-32/build.sh @@ -261,7 +261,7 @@ cp $fusato/applications/* $fusato/fusato/config/includes.chroot/usr/share/applic cp $fusato/hooks/live/* $fusato/fusato/config/includes.chroot/usr/lib/live/config cp $fusato/hooks/normal/* $fusato/fusato/config/hooks/normal cp $fusato/grub/grub $fusato/fusato/config/includes.chroot/etc/default -cp $fusato/calamares/sources-final $fusato/fusato/config/includes.chroot/usr/sbin +cp $fusato/calamares/sources-debian/* $fusato/fusato/config/includes.chroot/usr/sbin cp $fusato/calamares/bootloader-config-32/* $fusato/fusato/config/includes.chroot/usr/sbin cp $fusato/calamares/install-peppermint $fusato/fusato/config/includes.chroot/usr/bin cp $fusato/database/* $fusato/fusato/config/includes.chroot/opt/pypep/dbpep diff --git a/debian-64/build.sh b/debian-64/build.sh index cfd0ee03d..2acdb86de 100755 --- a/debian-64/build.sh +++ b/debian-64/build.sh @@ -259,7 +259,7 @@ cp $fusato/applications/* $fusato/fusato/config/includes.chroot/usr/share/applic cp $fusato/hooks/live/* $fusato/fusato/config/includes.chroot/usr/lib/live/config cp $fusato/hooks/normal/* $fusato/fusato/config/hooks/normal cp $fusato/grub/grub $fusato/fusato/config/includes.chroot/etc/default -cp $fusato/calamares/sources-final $fusato/fusato/config/includes.chroot/usr/sbin +cp $fusato/calamares/sources-debian/* $fusato/fusato/config/includes.chroot/usr/sbin cp $fusato/calamares/install-peppermint $fusato/fusato/config/includes.chroot/usr/bin cp $fusato/database/* $fusato/fusato/config/includes.chroot/opt/pypep/dbpep cp $fusato/PepProPixMaps/* $fusato/fusato/config/includes.chroot/usr/share/pixmaps diff --git a/debian-arm64/build.sh b/debian-arm64/build.sh index 32e2a6391..8ea96701d 100755 --- a/debian-arm64/build.sh +++ b/debian-arm64/build.sh @@ -262,7 +262,7 @@ cp $fusato/applications/* $fusato/fusato/config/includes.chroot/usr/share/applic cp $fusato/hooks/live/* $fusato/fusato/config/includes.chroot/usr/lib/live/config cp $fusato/hooks/normal/* $fusato/fusato/config/hooks/normal cp $fusato/grub/grub $fusato/fusato/config/includes.chroot/etc/default -cp $fusato/calamares/sources-final $fusato/fusato/config/includes.chroot/usr/sbin +cp $fusato/calamares/sources-debian/* $fusato/fusato/config/includes.chroot/usr/sbin cp $fusato/calamares/bootloader-config-arm64/* $fusato/fusato/config/includes.chroot/usr/sbin cp $fusato/calamares/install-peppermint $fusato/fusato/config/includes.chroot/usr/bin cp $fusato/database/* $fusato/fusato/config/includes.chroot/opt/pypep/dbpep diff --git a/devuan-32/build.sh b/devuan-32/build.sh index 1bc3ceac7..902b5cbfd 100755 --- a/devuan-32/build.sh +++ b/devuan-32/build.sh @@ -263,7 +263,7 @@ cp $fusato/applications/* $fusato/fusato/config/includes.chroot/usr/share/applic cp $fusato/hooks/live/* $fusato/fusato/config/includes.chroot/usr/lib/live/config cp $fusato/hooks/normal/* $fusato/fusato/config/hooks/normal cp $fusato/grub/grub $fusato/fusato/config/includes.chroot/etc/default -cp $fusato/calamares/sources-final $fusato/fusato/config/includes.chroot/usr/sbin +cp $fusato/calamares/sources-devuan/* $fusato/fusato/config/includes.chroot/usr/sbin cp $fusato/calamares/bootloader-config-32/* $fusato/fusato/config/includes.chroot/usr/sbin cp $fusato/calamares/install-peppermint $fusato/fusato/config/includes.chroot/usr/bin cp $fusato/database/* $fusato/fusato/config/includes.chroot/opt/pypep/dbpep diff --git a/devuan-64/build.sh b/devuan-64/build.sh index 36b968757..1540d0c12 100755 --- a/devuan-64/build.sh +++ b/devuan-64/build.sh @@ -261,7 +261,7 @@ cp $fusato/applications/* $fusato/fusato/config/includes.chroot/usr/share/applic cp $fusato/hooks/live/* $fusato/fusato/config/includes.chroot/usr/lib/live/config cp $fusato/hooks/normal/* $fusato/fusato/config/hooks/normal cp $fusato/grub/grub $fusato/fusato/config/includes.chroot/etc/default -cp $fusato/calamares/sources-final $fusato/fusato/config/includes.chroot/usr/sbin +cp $fusato/calamares/sources-devuan/* $fusato/fusato/config/includes.chroot/usr/sbin cp $fusato/calamares/install-peppermint $fusato/fusato/config/includes.chroot/usr/bin cp $fusato/database/* $fusato/fusato/config/includes.chroot/opt/pypep/dbpep cp $fusato/PepProPixMaps/* $fusato/fusato/config/includes.chroot/usr/share/pixmaps diff --git a/devuan-arm64/build.sh b/devuan-arm64/build.sh index 4c014d90b..7ad2a2260 100755 --- a/devuan-arm64/build.sh +++ b/devuan-arm64/build.sh @@ -262,7 +262,7 @@ cp $fusato/applications/* $fusato/fusato/config/includes.chroot/usr/share/applic cp $fusato/hooks/live/* $fusato/fusato/config/includes.chroot/usr/lib/live/config cp $fusato/hooks/normal/* $fusato/fusato/config/hooks/normal cp $fusato/grub/grub $fusato/fusato/config/includes.chroot/etc/default -cp $fusato/calamares/sources-final $fusato/fusato/config/includes.chroot/usr/sbin +cp $fusato/calamares/sources-devuan/* $fusato/fusato/config/includes.chroot/usr/sbin cp $fusato/calamares/bootloader-config-arm64/* $fusato/fusato/config/includes.chroot/usr/sbin cp $fusato/calamares/install-peppermint $fusato/fusato/config/includes.chroot/usr/bin cp $fusato/database/* $fusato/fusato/config/includes.chroot/opt/pypep/dbpep