diff --git a/debian.sh b/debian.sh index 10bafbe..ca83642 100755 --- a/debian.sh +++ b/debian.sh @@ -38,7 +38,7 @@ FLATPAKS+=(org.kde.kapman net.sourceforge.ExtremeTuxRacer com.github.bjaraujo.Bo #Packages PACKAGES=" iptables-persistent resolvconf wireguard wireguard-tools nmap libsecret-tools libglu1-mesa preload flatpak powertop acpi cockpit cockpit-podman packagekit cockpit-packagekit cockpit-storaged " -BASE_PACKAGES=" 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 efibootmgr linux-headers-amd64 cryptsetup network-manager-openvpn ntp screen docbook-xsl alsa-utils sysstat fuse3 build-essential unzip bash-completion parted dosfstools wget curl " +BASE_PACKAGES=" 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 " SHARED_DESKTOP_APPS=" nheko firefox-esr kwin-addons kde-standard konsole dolphin kde-spectacle print-manager digikam keepassxc telegram-desktop krita nextcloud-desktop handbrake calligra " #REMOVED=" cockpit-pcp " #TROUBLESOME_PACKAGES - packages here that may not be available for your Debian release @@ -50,9 +50,9 @@ TAR_EXCLUDES="--exclude=/.snapshots --exclude=/snapshots --exclude=/var/backups partitionDetection() { #This is used for the installer to do script-based actions - EFI="/dev/$(lsblk | grep $HARD_DISK | head -2 | tail -1 | sed 's/├─//' | cut -d ' ' -f1)" - BTRFS="/dev/$(lsblk | grep $HARD_DISK | head -4 | tail -1 | sed 's/└─//' | cut -d ' ' -f1)" - BOOT="/dev/$(lsblk | grep $HARD_DISK | head -3 | tail -1 | sed 's/├─//' | cut -d ' ' -f1)" + EFI=`blkid | grep $HARD_DISK | sort | cut -d ":" -f1 | head -1 | tail -1` + BOOT=`blkid | grep $HARD_DISK | sort | cut -d ":" -f1 | head -2 | tail -1` + BTRFS=`blkid | grep $HARD_DISK | sort | cut -d ":" -f1 | head -3 | tail -1` } partitionDetection @@ -181,11 +181,6 @@ decryptBoot() { configure-repository() { echo 'force-unsafe-io' >$TARGET/etc/dpkg/dpkg.cfg.d/docker-apt-speedup - #Prevent this Kernel from being automatically installed - echo "Package: linux-image-rt-amd64" > $TARGET/etc/apt/preferences - echo "Pin: release *" >> $TARGET/etc/apt/preferences - echo "Pin-Priority: -1" >> $TARGET/etc/apt/preferences - if [ "$DEBIAN_RELEASE" == "testing" ]; then echo "deb https://deb.debian.org/debian $DEBIAN_RELEASE main contrib non-free non-free-firmware" >$TARGET/etc/apt/sources.list chroot $TARGET /usr/bin/apt update