From 98d0051d01008d984630caff41e60747cd138d07 Mon Sep 17 00:00:00 2001 From: manuel Date: Sun, 8 Sep 2024 15:29:05 +0000 Subject: [PATCH] update calamares configs and files --- bootloader-config/bootloader-config | 49 +++++++-- .../{ => calamares}/branding/my-distro/1.png | Bin .../{ => calamares}/branding/my-distro/2.png | Bin .../{ => calamares}/branding/my-distro/3.png | Bin .../{ => calamares}/branding/my-distro/4.png | Bin .../{ => calamares}/branding/my-distro/5.png | Bin .../{ => calamares}/branding/my-distro/6.png | Bin .../branding/my-distro/branding.desc | 0 .../branding/my-distro/debian-logo.png | Bin .../branding/my-distro/languages.png | Bin .../branding/my-distro/show.qml | 0 .../{ => calamares}/modules/bootloader.conf | 0 .../modules/displaymanager.conf | 0 .../{ => calamares}/modules/finished.conf | 0 calamares/{ => calamares}/modules/fstab.conf | 0 calamares/{ => calamares}/modules/locale.conf | 0 .../modules/luksopenswaphookcfg.conf | 0 .../{ => calamares}/modules/machineid.conf | 0 calamares/{ => calamares}/modules/mount.conf | 0 .../modules/netinstall-packages.conf | 0 .../modules/netinstall-packages.yaml | 0 .../modules/openrcdmcryptcfg.conf | 0 .../{ => calamares}/modules/packages.conf | 0 .../{ => calamares}/modules/partition.conf | 0 .../modules/services-systemd.conf | 0 .../{ => calamares}/modules/unpackfs.conf | 0 calamares/{ => calamares}/modules/users.conf | 0 .../{ => calamares}/modules/welcome.conf | 0 calamares/{ => calamares}/settings.conf | 17 +--- calamares/modules/grub-defaults/module.desc | 6 ++ calamares/modules/update-system/module.desc | 6 ++ ...calamares-settings-debian.gschema.override | 10 ++ calamares/scripts/grub-defaults | 53 ++++++++++ calamares/scripts/update-system | 35 +++++++ devuan/Devuan.info | 95 ------------------ devuan/Devuan.mirrors | 40 -------- .../normal/install-firefox-latest.hook.chroot | 62 ++++++++++++ my-distro-devuan-32-pae/build.sh | 15 ++- my-distro-devuan-32/build.sh | 13 ++- my-distro-devuan-64/build.sh | 13 ++- 40 files changed, 249 insertions(+), 165 deletions(-) rename calamares/{ => calamares}/branding/my-distro/1.png (100%) rename calamares/{ => calamares}/branding/my-distro/2.png (100%) rename calamares/{ => calamares}/branding/my-distro/3.png (100%) rename calamares/{ => calamares}/branding/my-distro/4.png (100%) rename calamares/{ => calamares}/branding/my-distro/5.png (100%) rename calamares/{ => calamares}/branding/my-distro/6.png (100%) rename calamares/{ => calamares}/branding/my-distro/branding.desc (100%) rename calamares/{ => calamares}/branding/my-distro/debian-logo.png (100%) rename calamares/{ => calamares}/branding/my-distro/languages.png (100%) rename calamares/{ => calamares}/branding/my-distro/show.qml (100%) rename calamares/{ => calamares}/modules/bootloader.conf (100%) rename calamares/{ => calamares}/modules/displaymanager.conf (100%) rename calamares/{ => calamares}/modules/finished.conf (100%) rename calamares/{ => calamares}/modules/fstab.conf (100%) rename calamares/{ => calamares}/modules/locale.conf (100%) rename calamares/{ => calamares}/modules/luksopenswaphookcfg.conf (100%) rename calamares/{ => calamares}/modules/machineid.conf (100%) rename calamares/{ => calamares}/modules/mount.conf (100%) rename calamares/{ => calamares}/modules/netinstall-packages.conf (100%) rename calamares/{ => calamares}/modules/netinstall-packages.yaml (100%) rename calamares/{ => calamares}/modules/openrcdmcryptcfg.conf (100%) rename calamares/{ => calamares}/modules/packages.conf (100%) rename calamares/{ => calamares}/modules/partition.conf (100%) rename calamares/{ => calamares}/modules/services-systemd.conf (100%) rename calamares/{ => calamares}/modules/unpackfs.conf (100%) rename calamares/{ => calamares}/modules/users.conf (100%) rename calamares/{ => calamares}/modules/welcome.conf (100%) rename calamares/{ => calamares}/settings.conf (92%) create mode 100644 calamares/modules/grub-defaults/module.desc create mode 100644 calamares/modules/update-system/module.desc create mode 100644 calamares/schemas/96_calamares-settings-debian.gschema.override create mode 100755 calamares/scripts/grub-defaults create mode 100755 calamares/scripts/update-system delete mode 100644 devuan/Devuan.info delete mode 100644 devuan/Devuan.mirrors create mode 100644 hooks/normal/install-firefox-latest.hook.chroot diff --git a/bootloader-config/bootloader-config b/bootloader-config/bootloader-config index 0dbae957..d95b0017 100755 --- a/bootloader-config/bootloader-config +++ b/bootloader-config/bootloader-config @@ -2,20 +2,53 @@ CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") -# Set secure permissions for the initramfs if we're configuring +# Install luks utilities if needed. +# Also, set secure permissions for the initramfs if we're configuring # full-disk-encryption. The initramfs is re-generated later in the # installation process so we only set the permissions snippet without # regenerating the initramfs right now: if [ "$(mount | grep $CHROOT" " | cut -c -16)" = "/dev/mapper/luks" ]; then echo "UMASK=0077" > $CHROOT/etc/initramfs-tools/conf.d/initramfs-permissions + chroot $CHROOT apt-get -y install cryptsetup-initramfs cryptsetup keyutils fi +# Update packages in the repos +chroot $CHROOT apt-get update + echo "Running bootloader-config..." -if [ -d /sys/firmware/efi/efivars ]; then - echo " * Installing grub-efi (uefi)..." - DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-ia32 cryptsetup keyutils -else - echo " * install grub... (bios)" - DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc cryptsetup keyutils -fi +# Detect architecture and install the appropriate GRUB package +ARCH=$(uname -m) +case "$ARCH" in + x86_64) + if [ -d /sys/firmware/efi/efivars ]; then + echo " * Installing grub-efi (uefi)..." + DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-amd64 + else + echo " * Installing grub-pc (bios)..." + DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc + fi + ;; +i686) + if [ -d /sys/firmware/efi/efivars ]; then + echo " * Installing grub-efi-ia32 (uefi 32-bit)..." + DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-ia32 + else + echo " * Installing grub-pc (bios 32-bit)..." + DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc + fi + ;; + aarch64) + echo " * Installing grub-efi-arm64 (uefi arm64)..." + DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-arm64 + ;; + *) + echo "Unsupported architecture: $ARCH" + exit 1 + ;; +esac + +# Re-enable os-prober: +sed -i "s/#GRUB_DISABLE_OS_PROBER=false/# OS_PROBER re-enabled by Debian Calamares installation:\nGRUB_DISABLE_OS_PROBER=false/g" $CHROOT/etc/default/grub +chroot $CHROOT /usr/sbin/update-grub + diff --git a/calamares/branding/my-distro/1.png b/calamares/calamares/branding/my-distro/1.png similarity index 100% rename from calamares/branding/my-distro/1.png rename to calamares/calamares/branding/my-distro/1.png diff --git a/calamares/branding/my-distro/2.png b/calamares/calamares/branding/my-distro/2.png similarity index 100% rename from calamares/branding/my-distro/2.png rename to calamares/calamares/branding/my-distro/2.png diff --git a/calamares/branding/my-distro/3.png b/calamares/calamares/branding/my-distro/3.png similarity index 100% rename from calamares/branding/my-distro/3.png rename to calamares/calamares/branding/my-distro/3.png diff --git a/calamares/branding/my-distro/4.png b/calamares/calamares/branding/my-distro/4.png similarity index 100% rename from calamares/branding/my-distro/4.png rename to calamares/calamares/branding/my-distro/4.png diff --git a/calamares/branding/my-distro/5.png b/calamares/calamares/branding/my-distro/5.png similarity index 100% rename from calamares/branding/my-distro/5.png rename to calamares/calamares/branding/my-distro/5.png diff --git a/calamares/branding/my-distro/6.png b/calamares/calamares/branding/my-distro/6.png similarity index 100% rename from calamares/branding/my-distro/6.png rename to calamares/calamares/branding/my-distro/6.png diff --git a/calamares/branding/my-distro/branding.desc b/calamares/calamares/branding/my-distro/branding.desc similarity index 100% rename from calamares/branding/my-distro/branding.desc rename to calamares/calamares/branding/my-distro/branding.desc diff --git a/calamares/branding/my-distro/debian-logo.png b/calamares/calamares/branding/my-distro/debian-logo.png similarity index 100% rename from calamares/branding/my-distro/debian-logo.png rename to calamares/calamares/branding/my-distro/debian-logo.png diff --git a/calamares/branding/my-distro/languages.png b/calamares/calamares/branding/my-distro/languages.png similarity index 100% rename from calamares/branding/my-distro/languages.png rename to calamares/calamares/branding/my-distro/languages.png diff --git a/calamares/branding/my-distro/show.qml b/calamares/calamares/branding/my-distro/show.qml similarity index 100% rename from calamares/branding/my-distro/show.qml rename to calamares/calamares/branding/my-distro/show.qml diff --git a/calamares/modules/bootloader.conf b/calamares/calamares/modules/bootloader.conf similarity index 100% rename from calamares/modules/bootloader.conf rename to calamares/calamares/modules/bootloader.conf diff --git a/calamares/modules/displaymanager.conf b/calamares/calamares/modules/displaymanager.conf similarity index 100% rename from calamares/modules/displaymanager.conf rename to calamares/calamares/modules/displaymanager.conf diff --git a/calamares/modules/finished.conf b/calamares/calamares/modules/finished.conf similarity index 100% rename from calamares/modules/finished.conf rename to calamares/calamares/modules/finished.conf diff --git a/calamares/modules/fstab.conf b/calamares/calamares/modules/fstab.conf similarity index 100% rename from calamares/modules/fstab.conf rename to calamares/calamares/modules/fstab.conf diff --git a/calamares/modules/locale.conf b/calamares/calamares/modules/locale.conf similarity index 100% rename from calamares/modules/locale.conf rename to calamares/calamares/modules/locale.conf diff --git a/calamares/modules/luksopenswaphookcfg.conf b/calamares/calamares/modules/luksopenswaphookcfg.conf similarity index 100% rename from calamares/modules/luksopenswaphookcfg.conf rename to calamares/calamares/modules/luksopenswaphookcfg.conf diff --git a/calamares/modules/machineid.conf b/calamares/calamares/modules/machineid.conf similarity index 100% rename from calamares/modules/machineid.conf rename to calamares/calamares/modules/machineid.conf diff --git a/calamares/modules/mount.conf b/calamares/calamares/modules/mount.conf similarity index 100% rename from calamares/modules/mount.conf rename to calamares/calamares/modules/mount.conf diff --git a/calamares/modules/netinstall-packages.conf b/calamares/calamares/modules/netinstall-packages.conf similarity index 100% rename from calamares/modules/netinstall-packages.conf rename to calamares/calamares/modules/netinstall-packages.conf diff --git a/calamares/modules/netinstall-packages.yaml b/calamares/calamares/modules/netinstall-packages.yaml similarity index 100% rename from calamares/modules/netinstall-packages.yaml rename to calamares/calamares/modules/netinstall-packages.yaml diff --git a/calamares/modules/openrcdmcryptcfg.conf b/calamares/calamares/modules/openrcdmcryptcfg.conf similarity index 100% rename from calamares/modules/openrcdmcryptcfg.conf rename to calamares/calamares/modules/openrcdmcryptcfg.conf diff --git a/calamares/modules/packages.conf b/calamares/calamares/modules/packages.conf similarity index 100% rename from calamares/modules/packages.conf rename to calamares/calamares/modules/packages.conf diff --git a/calamares/modules/partition.conf b/calamares/calamares/modules/partition.conf similarity index 100% rename from calamares/modules/partition.conf rename to calamares/calamares/modules/partition.conf diff --git a/calamares/modules/services-systemd.conf b/calamares/calamares/modules/services-systemd.conf similarity index 100% rename from calamares/modules/services-systemd.conf rename to calamares/calamares/modules/services-systemd.conf diff --git a/calamares/modules/unpackfs.conf b/calamares/calamares/modules/unpackfs.conf similarity index 100% rename from calamares/modules/unpackfs.conf rename to calamares/calamares/modules/unpackfs.conf diff --git a/calamares/modules/users.conf b/calamares/calamares/modules/users.conf similarity index 100% rename from calamares/modules/users.conf rename to calamares/calamares/modules/users.conf diff --git a/calamares/modules/welcome.conf b/calamares/calamares/modules/welcome.conf similarity index 100% rename from calamares/modules/welcome.conf rename to calamares/calamares/modules/welcome.conf diff --git a/calamares/settings.conf b/calamares/calamares/settings.conf similarity index 92% rename from calamares/settings.conf rename to calamares/calamares/settings.conf index b25c1b28..a600ff86 100644 --- a/calamares/settings.conf +++ b/calamares/calamares/settings.conf @@ -5,18 +5,6 @@ # "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules modules-search: [ local, /usr/lib/calamares/modules ] -# YAML: list of maps of string:string key-value pairs. -instances: -- id: packages - module: netinstall - config: netinstall-packages.conf -- id: system - module: netinstall - config: netinstall-system.conf -- id: pkgs - module: netinstall - config: netinstall-pkgs.conf - # If this is set to true, Calamares refers to itself as a "setup program" # rather than an "installer". Defaults to the value of dont-chroot, but # Calamares will complain if this is not explicitly set. @@ -61,7 +49,6 @@ sequence: - locale - keyboard - partition - - netinstall@packages - users - summary @@ -91,11 +78,15 @@ sequence: - bootloader - packages - luksbootkeyfile + - luksopenswaphookcfg - plymouthcfg - initramfscfg - initramfs - sources-media-unmount - sources-final + - update-system + - grub-defaults + - shellprocess - umount # Phase 3 - postinstall. diff --git a/calamares/modules/grub-defaults/module.desc b/calamares/modules/grub-defaults/module.desc new file mode 100644 index 00000000..391d6a06 --- /dev/null +++ b/calamares/modules/grub-defaults/module.desc @@ -0,0 +1,6 @@ +--- +type: "job" +name: "grub-defaults" +interface: "process" +command: "/usr/sbin/grub-defaults" +timeout: 600 diff --git a/calamares/modules/update-system/module.desc b/calamares/modules/update-system/module.desc new file mode 100644 index 00000000..15b918dc --- /dev/null +++ b/calamares/modules/update-system/module.desc @@ -0,0 +1,6 @@ +--- +type: "job" +name: "update-system" +interface: "process" +command: "/usr/sbin/update-system" +timeout: 600 diff --git a/calamares/schemas/96_calamares-settings-debian.gschema.override b/calamares/schemas/96_calamares-settings-debian.gschema.override new file mode 100644 index 00000000..b9616ded --- /dev/null +++ b/calamares/schemas/96_calamares-settings-debian.gschema.override @@ -0,0 +1,10 @@ +# Launcher icons +[org.gnome.shell] +favorite-apps=['calamares-install-debian.desktop', firefox.desktop', 'libreoffice-writer.desktop', 'thunar.desktop', 'org.gnome.Software.desktop', 'yelp.desktop'] + +# We don't want the screensaver to enable on the live media while installing +[org.gnome.desktop.lockdown] +disable-lock-screen=true + +[org.gnome.desktop.session] +idle-delay=0 diff --git a/calamares/scripts/grub-defaults b/calamares/scripts/grub-defaults new file mode 100755 index 00000000..f9131aef --- /dev/null +++ b/calamares/scripts/grub-defaults @@ -0,0 +1,53 @@ +#!/bin/bash + +# SPDX-License-Identifier: GPL-3.0-or-later +# +# SPDX-FileCopyrightText: 2023 PeppermintOS Team (peppermintosteam@proton.me) + +# This script configures grub defaults after Debian installation. + +# Define CHROOT + CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") + +# Sets GRUB configuration. +# Writes the configuration to the /etc/default/grub file. +# Updates the bootloader. + +# Check if CHROOT is set +if [ -z "$CHROOT" ]; then + echo "CHROOT not set. Exiting." + exit 1 +fi + +# Defines the variables +GRUB_DEFAULT=0 +GRUB_TIMEOUT=5 +GRUB_DISTRIBUTOR="My-distro" +GRUB_CMDLINE_LINUX_DEFAULT="quiet splash" +GRUB_CMDLINE_LINUX="" +GRUB_GFXMODE=1440x900 +GRUB_THEME="/boot/grub/themes/my-distro/theme.txt" +GRUB_DISABLE_OS_PROBER=false + +# GRUB configuration file path +GRUB_CONFIG_FILE="$CHROOT/etc/default/grub" + +# Modify the GRUB file +sed -i "s/^GRUB_DEFAULT=.*/GRUB_DEFAULT=$GRUB_DEFAULT/" $GRUB_CONFIG_FILE +sed -i "s/^GRUB_TIMEOUT=.*/GRUB_TIMEOUT=$GRUB_TIMEOUT/" $GRUB_CONFIG_FILE +sed -i "s/^GRUB_DISTRIBUTOR=.*/GRUB_DISTRIBUTOR=\"$GRUB_DISTRIBUTOR\"/" $GRUB_CONFIG_FILE +sed -i "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"$GRUB_CMDLINE_LINUX_DEFAULT\"/" $GRUB_CONFIG_FILE +sed -i "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"$GRUB_CMDLINE_LINUX\"/" $GRUB_CONFIG_FILE +sed -i "s/^#GRUB_GFXMODE=.*/GRUB_GFXMODE=$GRUB_GFXMODE/" $GRUB_CONFIG_FILE +# Add GRUB_THEME if it doesn't exist +if ! grep -q "^GRUB_THEME=" $GRUB_CONFIG_FILE; then + echo "GRUB_THEME=\"$GRUB_THEME\"" >> $GRUB_CONFIG_FILE +else + sed -i "s#^GRUB_THEME=.*#GRUB_THEME=\"$GRUB_THEME\"#" $GRUB_CONFIG_FILE +fi +sed -i "s/^#GRUB_DISABLE_OS_PROBER=.*/GRUB_DISABLE_OS_PROBER=$GRUB_DISABLE_OS_PROBER/" $GRUB_CONFIG_FILE + +# Run update-grub after modifying the file +chroot $CHROOT update-grub + + diff --git a/calamares/scripts/update-system b/calamares/scripts/update-system new file mode 100755 index 00000000..98838b84 --- /dev/null +++ b/calamares/scripts/update-system @@ -0,0 +1,35 @@ +#!/bin/bash + +# Apply updates to the system + +# Function to update the system +function update_system() { + # Define CHROOT + CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") + + # Verifying CHROOT + if [ -z "$CHROOT" ]; then + echo "Error: CHROOT is not set." + exit 1 + fi + + echo "Updating the system..." + + # Update the package list + chroot $CHROOT /usr/bin/apt update + + # Update installed packages + chroot $CHROOT /usr/bin/apt upgrade -y + + # Remove unnecessary packages + chroot $CHROOT /usr/bin/apt autoremove -y + + # Clean the APT cache + chroot $CHROOT /usr/bin/apt clean + + echo "System successfully updated!" +} + +# Run the function to update the system +update_system + diff --git a/devuan/Devuan.info b/devuan/Devuan.info deleted file mode 100644 index 91720c33..00000000 --- a/devuan/Devuan.info +++ /dev/null @@ -1,95 +0,0 @@ -#ChangelogURI: http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog -X-Exclude-Suites: jessie , ascii, beowulf - -Suite: {series} -RepositoryType: deb -BaseURI: http://deb.devuan.org/merged/ -MatchURI: ((http|ftp)[0-9]*\.([a-z]*\.){{0,1}}|deb\.|httpredir\.)devuan\.org -MirrorsFile: Devuan.mirrors -Description: Devuan {version} '{codename}' -Component: main -CompDescription: Officially supported -Component: contrib -CompDescription: DFSG-compatible Software with Non-Free Dependencies -Component: non-free -CompDescription: Non-DFSG-compatible Software - -Suite: {series}-security -RepositoryType: deb -BaseURI: http://deb.devuan.org/merged/ -MatchURI: security\.devuan\.org -ParentSuite: {series} -Description: Security updates -X-Version: ge 11 - -Suite: {series}/updates -RepositoryType: deb -BaseURI: http://deb.devuan.org/merged/ -MatchURI: security\.devuan\.org -ParentSuite: {series} -Description: Security updates -X-Version: le 10 - -Suite: {series}-updates -RepositoryType: deb -ParentSuite: {series} -Description: Recommended updates -X-Version: ge 7 - -Suite: {series}-proposed-updates -RepositoryType: deb -ParentSuite: {series} -Description: Proposed updates - -Suite: stable -RepositoryType: deb -BaseURI: http://deb.devuan.org/merged/ -MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}devuan\.org -MirrorsFile: Devuan.mirrors -Description: Devuancurrent stable release -Component: main -CompDescription: Officially supported -Component: contrib -CompDescription: DFSG-compatible Software with Non-Free Dependencies -Component: non-free -CompDescription: Non-DFSG-compatible Software - -Suite: testing -RepositoryType: deb -BaseURI: http://deb.devuan.org/merged/ -MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}devuan\.org -MirrorsFile: Devuan.mirrors -Description: Devuantesting -Component: main -CompDescription: Officially supported -Component: contrib -CompDescription: DFSG-compatible Software with Non-Free Dependencies -Component: non-free -CompDescription: Non-DFSG-compatible Software - -Suite: sid -RepositoryType: deb -BaseURI: http://deb.devuan.org/merged/ -MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}devuan\.org -MirrorsFile: Devuan.mirrors -Description: Devuan'ceres' (unstable) -Component: main -CompDescription: Officially supported -Component: contrib -CompDescription: DFSG-compatible Software with Non-Free Dependencies -Component: non-free -CompDescription: Non-DFSG-compatible Software - -Suite: unstable -RepositoryType: deb -BaseURI: http://deb.devuan.org/merged/ -MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}devuan\.org -MirrorsFile: Devuan.mirrors -Description: Devuan'ceres' (unstable) -Component: main -CompDescription: Officially supported -Component: contrib -CompDescription: DFSG-compatible Software with Non-Free Dependencies -Component: non-free -CompDescription: Non-DFSG-compatible Software - diff --git a/devuan/Devuan.mirrors b/devuan/Devuan.mirrors deleted file mode 100644 index 1a032bb9..00000000 --- a/devuan/Devuan.mirrors +++ /dev/null @@ -1,40 +0,0 @@ -#LOC:FR -http:pkgmaster.devuan.org/devuan/ -#LOC:NL -http://sledjhamr.org/devuan/ -http://mirror.koddos.net/devuan/ -http://mirror.vpgrp.io/devuan/ -#LOC:CL -http://devuan.dcc.uchile.cl/devuan/ -http://dist-mirror.fem.tu-ilmenau.de/devuan/ -#LOC:DE -http://ftp.fau.de/devuan/ -http://mirror.checkdomain.de/devuan/ -http://devuan.bio.lmu.de/devuan/ -http://mirror.stinpriza.org/devuan/ -#LOC:CH -http://mirror.ungleich.ch/mirror/packages/devuan/ -http://devuan.planetcobalt.net/devuan/ -#LOC:BG -http://devuan.ipacct.com/devuan/ -#LOC:FI -http://devuan.packet-gain.de/devuan/ -#LOC:BR -http://devuan.c3sl.ufpr.br/devuan/ -#LOC:DK -http://mirrors.dotsrc.org/devuan/ -#LOC:UY -http://espejito.fder.edu.uy/devuan/ -#LOC:JP -http://devuan.m10k.jp/devuan/ -#LOC:US -http://mirrors.ocf.berkeley.edu/devuan/ -http://dev.beard.ly/devuan/ -#LOC:HU -http://quantum-mirror.hu/mirrors/pub/devuan/ -#LOC:ES -http://repo.ifca.es/devuan/ -#LOC:CA -http://mishka.snork.ca/devuan/ -#LOC:TW -http://tw1.mirror.blendbyte.net/devuan/ \ No newline at end of file diff --git a/hooks/normal/install-firefox-latest.hook.chroot b/hooks/normal/install-firefox-latest.hook.chroot new file mode 100644 index 00000000..c17a63df --- /dev/null +++ b/hooks/normal/install-firefox-latest.hook.chroot @@ -0,0 +1,62 @@ +#!/bin/bash + +# Script to be used as a hook in Debian Live-Build +# to install Firefox from the official Mozilla repository along with all available language packs + +# Function to set up the Mozilla repository and GPG key +setup_repository_and_key() { + echo "Setting up Mozilla repository and GPG key for Firefox..." + + # Create directory to store the APT repository keyring if it doesn't exist + install -d -m 0755 /etc/apt/keyrings + + # Import the Mozilla APT repository authentication key + wget -q https://packages.mozilla.org/apt/repo-signing-key.gpg -O- | tee /etc/apt/keyrings/packages.mozilla.org.asc > /dev/null + + # Verify the GPG key fingerprint + expected_fingerprint="35BAA0B33E9EB396F59CA838C0BA5CE6DC6315A3" + actual_fingerprint=$(gpg -n -q --import --import-options import-show /etc/apt/keyrings/packages.mozilla.org.asc | awk '/pub/{getline; gsub(/^ +| +$/,""); print $0}') + + if [ "$actual_fingerprint" == "$expected_fingerprint" ]; then + echo "The GPG key fingerprint matches: $actual_fingerprint." + else + echo "Verification failed: the GPG key fingerprint ($actual_fingerprint) does not match the expected one ($expected_fingerprint)." + exit 1 + fi + + # Add the Mozilla APT repository to the sources list + echo "deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main" > /etc/apt/sources.list.d/mozilla.list + + # Configure APT to prioritize packages from the Mozilla repository + echo ' +Package: * +Pin: origin packages.mozilla.org +Pin-Priority: 1000 +' > /etc/apt/preferences.d/mozilla + + # Update the package list + apt-get update +} + +# Function to install Firefox and available language packs +install_firefox() { + echo "Installing Firefox and its language packs..." + + # Install Firefox + apt-get install -y firefox + + # Install all available Firefox language packs + apt-get install -y $(apt-cache search firefox-l10n | awk '{print $1}') +} + +# Main execution of the script +main() { + setup_repository_and_key + install_firefox + + echo "Firefox installation completed." +} + +# Execute the main function +main + diff --git a/my-distro-devuan-32-pae/build.sh b/my-distro-devuan-32-pae/build.sh index 795943cb..dde00c37 100755 --- a/my-distro-devuan-32-pae/build.sh +++ b/my-distro-devuan-32-pae/build.sh @@ -200,10 +200,12 @@ tumbler tumbler-plugins-extra ffmpegthumbnailer xterm +git +curl +wget grub-pc spice-vdagent console-setup -xdg-user-dirs-gtk " > $build/build/config/package-lists/packages.list.chroot @@ -223,6 +225,8 @@ shim-helpers-i386-signed shim-signed shim-signed-common shim-unsigned + + " > $build/build/config/package-lists/installer.list.binary @@ -246,10 +250,12 @@ mkdir -p $build/build/config/includes.chroot/usr/sbin mkdir -p $build/build/config/includes.chroot/etc/lightdm mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes -mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base +#mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop mkdir -p $build/build/config/includes.chroot/etc/default mkdir -p $build/build/config/includes.chroot/boot/grub/themes +mkdir -p $build/build/config/includes.chroot/usr/lib/calamares +mkdir -p $build/build/config/includes.chroot/etc/default mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates # Copy Configs to the chroot @@ -259,6 +265,7 @@ cp $build/hooks/live/* $build/build/config/includes.chroot/usr/lib/live/config cp $build/hooks/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin +cp $build/calamares/scripts/* $build/build/config/includes.chroot/usr/sbin cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin cp $build/grub/grub $build/build/config/includes.chroot/etc/default @@ -266,7 +273,7 @@ cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm cp -r $build/bootloaders/* $build/build/config/includes.binary cp -r $build/repos/* $build/build/config/archives cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds -cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares +cp -r $build/calamares/calamares/* $build/build/config/includes.chroot/etc/calamares cp -r $build/configs/* $build/build/config/includes.chroot/etc/ cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes @@ -274,9 +281,11 @@ cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes #cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes cp -r $build/packages/* $build/build/config/packages.chroot cp -r $build/grub/themes/my-distro $build/build/config/includes.chroot/boot/grub/themes +cp -r $build/calamares/modules/* $build/build/config/includes.chroot/usr/lib/calamares cp -r $build/devuan/* $build/build/config/includes.chroot/usr/share/python-apt/templates # build the ISO # lb build #--debug --verbose + diff --git a/my-distro-devuan-32/build.sh b/my-distro-devuan-32/build.sh index 32a38ce2..29b8e6b5 100755 --- a/my-distro-devuan-32/build.sh +++ b/my-distro-devuan-32/build.sh @@ -200,9 +200,13 @@ tumbler tumbler-plugins-extra ffmpegthumbnailer xterm +git +curl +wget grub-pc spice-vdagent console-setup +xdg-user-dirs-gtk " > $build/build/config/package-lists/packages.list.chroot @@ -222,7 +226,6 @@ shim-helpers-i386-signed shim-signed shim-signed-common shim-unsigned -xdg-user-dirs-gtk " > $build/build/config/package-lists/installer.list.binary @@ -247,10 +250,12 @@ mkdir -p $build/build/config/includes.chroot/usr/sbin mkdir -p $build/build/config/includes.chroot/etc/lightdm mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes -mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base +#mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop mkdir -p $build/build/config/includes.chroot/etc/default mkdir -p $build/build/config/includes.chroot/boot/grub/themes +mkdir -p $build/build/config/includes.chroot/usr/lib/calamares +mkdir -p $build/build/config/includes.chroot/etc/default mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates # Copy Configs to the chroot @@ -260,6 +265,7 @@ cp $build/hooks/live/* $build/build/config/includes.chroot/usr/lib/live/config cp $build/hooks/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin +cp $build/calamares/scripts/* $build/build/config/includes.chroot/usr/sbin cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin cp $build/grub/grub $build/build/config/includes.chroot/etc/default @@ -267,7 +273,7 @@ cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm cp -r $build/bootloaders/* $build/build/config/includes.binary cp -r $build/repos/* $build/build/config/archives cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds -cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares +cp -r $build/calamares/calamares/* $build/build/config/includes.chroot/etc/calamares cp -r $build/configs/* $build/build/config/includes.chroot/etc/ cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes @@ -275,6 +281,7 @@ cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes #cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes cp -r $build/packages/* $build/build/config/packages.chroot cp -r $build/grub/themes/my-distro $build/build/config/includes.chroot/boot/grub/themes +cp -r $build/calamares/modules/* $build/build/config/includes.chroot/usr/lib/calamares cp -r $build/devuan/* $build/build/config/includes.chroot/usr/share/python-apt/templates # build the ISO # diff --git a/my-distro-devuan-64/build.sh b/my-distro-devuan-64/build.sh index e3da47dd..3544266e 100755 --- a/my-distro-devuan-64/build.sh +++ b/my-distro-devuan-64/build.sh @@ -199,11 +199,15 @@ tumbler tumbler-plugins-extra ffmpegthumbnailer xterm +git +curl +wget grub-pc spice-vdagent console-setup xdg-user-dirs-gtk + " > $build/build/config/package-lists/packages.list.chroot @@ -247,11 +251,12 @@ mkdir -p $build/build/config/includes.chroot/usr/sbin mkdir -p $build/build/config/includes.chroot/etc/lightdm mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes -mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base +#mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop mkdir -p $build/build/config/includes.chroot/etc/default -mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates mkdir -p $build/build/config/includes.chroot/boot/grub/themes +mkdir -p $build/build/config/includes.chroot/usr/lib/calamares +mkdir -p $build/build/config/includes.chroot/etc/default mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates # Copy Configs to the chroot @@ -261,6 +266,7 @@ cp $build/hooks/live/* $build/build/config/includes.chroot/usr/lib/live/config cp $build/hooks/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin +cp $build/calamares/scripts/* $build/build/config/includes.chroot/usr/sbin cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin cp $build/grub/grub $build/build/config/includes.chroot/etc/default @@ -268,7 +274,7 @@ cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm cp -r $build/bootloaders/* $build/build/config/includes.binary cp -r $build/repos/* $build/build/config/archives cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds -cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares +cp -r $build/calamares/calamares/* $build/build/config/includes.chroot/etc/calamares cp -r $build/configs/* $build/build/config/includes.chroot/etc/ cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes @@ -276,6 +282,7 @@ cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes #cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes cp -r $build/packages/* $build/build/config/packages.chroot cp -r $build/grub/themes/my-distro $build/build/config/includes.chroot/boot/grub/themes +cp -r $build/calamares/modules/* $build/build/config/includes.chroot/usr/lib/calamares cp -r $build/devuan/* $build/build/config/includes.chroot/usr/share/python-apt/templates # Build the ISO #