diff --git a/files_to_inject/boot/grub/theme/logo.png b/files_to_inject/boot/grub/theme/logo.png old mode 100755 new mode 100644 index 4ac2c68..3fdeae5 Binary files a/files_to_inject/boot/grub/theme/logo.png and b/files_to_inject/boot/grub/theme/logo.png differ diff --git a/files_to_inject/preseeds/default.preseed b/files_to_inject/preseeds/default.preseed index 8c23850..282184a 100755 --- a/files_to_inject/preseeds/default.preseed +++ b/files_to_inject/preseeds/default.preseed @@ -56,7 +56,14 @@ d-i pkgsel/include string \ ffmpeg \ libavcodec-extra \ libavformat-extra \ - fish + fish \ + dkms \ + libdw-dev \ + clang \ + lld \ + llvm \ + cmatrix \ + btop # Installation GRUB avec support multi-OS d-i grub-installer/only_debian boolean true @@ -66,7 +73,7 @@ d-i grub-installer/with_other_os boolean true d-i grub-installer/bootdev seen false # Configuration post-installation : kernel XanMod, shell Fish, dépôts Flathub, mesa kisak et suppression Konqueror -d-i preseed/late_command string cp /cdrom/late_custom_whitout_kernel_mesa.sh /target/root/late_custom_whitout_kernel_mesa.sh ; chmod +x /target/root/late_custom_whitout_kernel_mesa.sh ; in-target bash /root/late_custom_whitout_kernel_mesa.sh +d-i preseed/late_command string cp /cdrom/preseeds/late_custom_amd.sh /target/root/late_custom_amd.sh ; chmod +x /target/root/late_custom_amd.sh ; in-target bash /root/late_custom_amd.sh # Finalisation : redémarrage automatique -d-i finish-install/reboot_in_progress note +d-i finish-install/reboot_in_progress note \ No newline at end of file diff --git a/files_to_inject/late_custom.sh b/files_to_inject/preseeds/late_custom_amd.sh old mode 100755 new mode 100644 similarity index 100% rename from files_to_inject/late_custom.sh rename to files_to_inject/preseeds/late_custom_amd.sh diff --git a/files_to_inject/late_custom_whitout_kernel_mesa.sh b/files_to_inject/preseeds/late_custom_nvidia.sh similarity index 59% rename from files_to_inject/late_custom_whitout_kernel_mesa.sh rename to files_to_inject/preseeds/late_custom_nvidia.sh index 0c0f93c..b4cfe8a 100644 --- a/files_to_inject/late_custom_whitout_kernel_mesa.sh +++ b/files_to_inject/preseeds/late_custom_nvidia.sh @@ -21,21 +21,24 @@ apt-get update 2>&1 | filter_warn apt-get install -y --no-install-recommends gpg dkms libdw-dev clang lld llvm flatpak linux-headers-$(uname -r) build-essential libglvnd-dev pkg-config 2>&1 | filter_warn # Ajouter la clé et le dépôt XanMod -# mkdir -p /etc/apt/keyrings -# timeout 30 wget -qO /etc/apt/keyrings/xanmod-archive-keyring.gpg https://dl.xanmod.org/archive.key || true -# echo 'deb [signed-by=/etc/apt/keyrings/xanmod-archive-keyring.gpg] http://deb.xanmod.org trixie main' > /etc/apt/sources.list.d/xanmod.list +mkdir -p /etc/apt/keyrings +timeout 30 wget -qO /etc/apt/keyrings/xanmod-archive-keyring.gpg https://dl.xanmod.org/archive.key || true +echo 'deb [signed-by=/etc/apt/keyrings/xanmod-archive-keyring.gpg] http://deb.xanmod.org trixie main' > /etc/apt/sources.list.d/xanmod.list # Ajouter la clé et le dépôt Kisak Mesa -# timeout 30 gpg --keyserver keyserver.ubuntu.com --recv-keys EB8B81E14DA65431D7504EA8F63F0F2B90935439 || true -# gpg --export EB8B81E14DA65431D7504EA8F63F0F2B90935439 > /etc/apt/trusted.gpg.d/kisak.gpg 2>/dev/null || true -# echo 'deb https://ppa.launchpadcontent.net/kisak/kisak-mesa/ubuntu plucky main' > /etc/apt/sources.list.d/kisak-mesa.list -# echo 'deb-src https://ppa.launchpadcontent.net/kisak/kisak-mesa/ubuntu plucky main' >> /etc/apt/sources.list.d/kisak-mesa.list +timeout 30 gpg --keyserver keyserver.ubuntu.com --recv-keys EB8B81E14DA65431D7504EA8F63F0F2B90935439 || true +gpg --export EB8B81E14DA65431D7504EA8F63F0F2B90935439 > /etc/apt/trusted.gpg.d/kisak.gpg 2>/dev/null || true +echo 'deb https://ppa.launchpadcontent.net/kisak/kisak-mesa/ubuntu plucky main' > /etc/apt/sources.list.d/kisak-mesa.list +echo 'deb-src https://ppa.launchpadcontent.net/kisak/kisak-mesa/ubuntu plucky main' >> /etc/apt/sources.list.d/kisak-mesa.list # Relancer la mise à jour des sources (pour les nouveaux dépôts) -# apt-get update 2>&1 | filter_warn +apt-get update 2>&1 | filter_warn # Installer le noyau XanMod -# apt-get install -y linux-xanmod-x64v3 2>&1 | filter_warn +apt-get install -y linux-xanmod-x64v3 2>&1 | filter_warn + +# Pilotes NVIDIA (décommenté si nécessaire) +apt-get install -y nvidia-driver-575-open 2>&1 | filter_warn # Ajouter flathub à flatpak timeout 30 flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo || true @@ -50,7 +53,7 @@ done # Activer le support i386 et mettre le système à niveau dpkg --add-architecture i386 || true -apt-get update 1>&1 | filter_warn -# apt-get -y dist-upgrade 2>&1 | filter_warn +apt-get update 2>&1 | filter_warn +apt-get -y dist-upgrade 2>&1 | filter_warn exit 0