From 88a58da5a2258ac736ee648e3d8bf5581964b2b6 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 17 Oct 2023 19:29:53 -0600 Subject: [PATCH] fix --- debian.sh | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/debian.sh b/debian.sh index 21e8618..dd36462 100755 --- a/debian.sh +++ b/debian.sh @@ -11,6 +11,7 @@ # 6. Easily create a bootable USB drive # 7. Automatic Partitioning # 8. Bypass entering encrypted disk password at boot time if desired +# 9. Xanmod Kernel # # INSTRUCTIONS # @@ -44,7 +45,7 @@ COMPRESSION='compress=zstd:10' AUTO_DECRYPT='True' FLATPAKS+=(io.exodus.Exodus us.zoom.Zoom) DESKTOP="KDE" - +XANMOD_KERNEL="y" #Packages BASE_PACKAGES=" firmware-realtek neofetch linux-image-amd64 grub-efi efibootmgr plymouth plymouth-themes duperemove btrfs-compsize btrfs-progs cryptsetup-initramfs linux-headers-amd64 firmware-iwlwifi firmware-linux firmware-linux-nonfree podman-compose podman-toolbox cockpit cockpit-podman packagekit cockpit-packagekit cockpit-storaged shfmt aardvark-dns power-profiles-daemon iptables-persistent resolvconf wireguard wireguard-tools nmap libsecret-tools libglu1-mesa preload flatpak powertop acpi btop inotify-tools debootstrap cups apt-transport-https samba samba-common nfs-common nfs-kernel-server linux-cpupower locales zram-tools acpid podman ghostscript cifs-utils ntp vim-airline rsync screen base udev git network-manager cryptsetup network-manager-openvpn ntp screen docbook-xsl alsa-utils sysstat fuse3 build-essential unzip bash-completion parted dosfstools wget curl " KDE_DESKTOP_ENV=" keepassxc krita libdbus-glib-1-2 calligra print-manager plasma-discover-backend-flatpak kwin-addons kde-standard konsole dolphin kde-spectacle " @@ -56,6 +57,15 @@ SHARED_DESKTOP_APPS=" telegram-desktop handbrake vlc nextcloud-desktop yt-dlp " PACKAGES="" TAR_EXCLUDES="--exclude=/.snapshots --exclude=/snapshots --exclude=/var/backups --exclude=/volumes/* --exclude=/mnt/* --exclude=/var/tmp/* --exclude=/tmp/* --exclude=/raid/* --exclude=/root/* --exclude=/var/cache/apt/archives/* --exclude=/proc/* --exclude=/.snapshots/* --exclude=/var/lib/libvirt/* --exclude=/dev/* --exclude=/sys/* --exclude=/home/* --exclude=/var/lib/postgresql --exclude=/var/lib/containers --exclude=/opt/chatgpt " +xanmod-kernel() { + curl -fSsL https://dl.xanmod.org/gpg.key | gpg --dearmor | tee /usr/share/keyrings/xanmod.gpg >/dev/null + echo 'deb [signed-by=/usr/share/keyrings/xanmod.gpg] http://deb.xanmod.org releases main' | tee /etc/apt/sources.list.d/xanmod-kernel.list + apt update + apt install -y linux-xanmod-lts-x64v4 + /sbin/update-grub + apt-mark hold linux-image-amd64 +} + installVPN() { cd /tmp rm -f *.deb @@ -233,7 +243,12 @@ configure-repository() { echo "deb https://deb.debian.org/debian $DEBIAN_RELEASE-backports main contrib non-free-firmware" >>$TARGET/etc/apt/sources.list chroot $TARGET /usr/bin/apt update chroot $TARGET /usr/bin/bash -c "export DEBIAN_FRONTEND=noninteractive;/usr/bin/apt install -y $PACKAGES " - chroot $TARGET /usr/bin/bash -c "export DEBIAN_FRONTEND=noninteractive;/usr/bin/apt dist-upgrade -y -t $DEBIAN_RELEASE-backports" + if [[ $XANMOD_KERNEL = *y* ]]; then + chroot $TARGET /usr/bin/apt-mark hold linux-image-amd64 + chroot $TARGET /usr/bin/bash -c "export DEBIAN_FRONTEND=noninteractive;/usr/bin/apt dist-upgrade -y" + else + chroot $TARGET /usr/bin/bash -c "export DEBIAN_FRONTEND=noninteractive;/usr/bin/apt dist-upgrade -y -t $DEBIAN_RELEASE-backports" + fi chroot $TARGET /usr/bin/bash -c "export DEBIAN_FRONTEND=noninteractive;/usr/bin/apt install -y $TROUBLESOME_PACKAGES" chroot $TARGET /usr/bin/bash -c "export DEBIAN_FRONTEND=noninteractive;/usr/bin/apt auto-remove -y" fi @@ -254,6 +269,9 @@ make-image() { echo "bash /usr/bin/debian.sh bootloader $1 $ROOT_NAME $ROOT_MAPPER_NAME" >>$TARGET/setup.sh echo 'bash /usr/bin/debian.sh grub-snapshots' >>$TARGET/setup.sh echo 'bash /usr/bin/debian.sh desktop' >>$TARGET/setup.sh + if [[ $XANMOD_KERNEL = *y* ]]; then + echo 'bash /usr/bin/debian.sh xanmod' >>$TARGET/setup.sh + fi echo '/usr/bin/apt clean all' >>$TARGET/setup.sh chmod +x $TARGET/usr/bin/debian.sh chmod +x $TARGET/setup.sh @@ -398,6 +416,9 @@ function setup_script() { #sed -i 's/most/dep/i' $TARGET/etc/initramfs-tools/initramfs.conf echo 'bash /usr/bin/debian.sh hibernate' >>$TARGET/setup.sh echo "bash /usr/bin/debian.sh bootloader $1 $ROOT_NAME $ROOT_MAPPER_NAME" >>$TARGET/setup.sh + if [[ $XANMOD_KERNEL = *y* ]]; then + echo 'bash /usr/bin/debian.sh xanmod' >>$TARGET/setup.sh + fi echo 'bash /usr/bin/debian.sh grub-snapshots' >>$TARGET/setup.sh echo 'bash /usr/bin/debian.sh accounts' >>$TARGET/setup.sh echo 'bash /usr/bin/debian.sh desktop' >>$TARGET/setup.sh @@ -837,6 +858,8 @@ elif [ "$1" = "accounts" ]; then accounts elif [ "$1" = "hibernate" ]; then hibernate-setup +elif [ "$1" = "xanmod" ]; then + xanmod-kernel elif [ "$1" = "flatpaks" ]; then flatpaks elif [ "$1" = "bootloader" ]; then