diff --git a/calamares/debian/calamares/settings.conf b/calamares/debian/calamares/settings.conf index 3c96f0e8..36325dfb 100644 --- a/calamares/debian/calamares/settings.conf +++ b/calamares/debian/calamares/settings.conf @@ -76,13 +76,16 @@ sequence: - bootloader-config - grubcfg - 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/devuan/calamares/settings.conf b/calamares/devuan/calamares/settings.conf index b25c1b28..c69a10e8 100644 --- a/calamares/devuan/calamares/settings.conf +++ b/calamares/devuan/calamares/settings.conf @@ -91,11 +91,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/scripts/grub-defaults b/calamares/scripts/grub-defaults new file mode 100755 index 00000000..35bd4cad --- /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="Peppermint" +GRUB_CMDLINE_LINUX_DEFAULT="quiet splash" +GRUB_CMDLINE_LINUX="" +GRUB_GFXMODE=1360x768 +GRUB_THEME="/boot/grub/themes/peppermint/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/deb-installer/debian/scripts/07grub-config b/deb-installer/debian/scripts/07grub-config index 0d4611ea..b05a58bc 100755 --- a/deb-installer/debian/scripts/07grub-config +++ b/deb-installer/debian/scripts/07grub-config @@ -17,6 +17,7 @@ GRUB_DISTRIBUTOR="My-distro" GRUB_CMDLINE_LINUX_DEFAULT="quiet splash" GRUB_CMDLINE_LINUX="" GRUB_GFXMODE=1440x900 +GRUB_THEME="/boot/grub/themes/peppermint/theme.txt" GRUB_DISABLE_OS_PROBER=false # GRUB configuration file path @@ -29,6 +30,12 @@ sed -i "s/^GRUB_DISTRIBUTOR=.*/GRUB_DISTRIBUTOR=\"$GRUB_DISTRIBUTOR\"/" $GRUB_CO 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 diff --git a/deb-installer/devuan/scripts/07grub-config b/deb-installer/devuan/scripts/07grub-config index 0d4611ea..b05a58bc 100755 --- a/deb-installer/devuan/scripts/07grub-config +++ b/deb-installer/devuan/scripts/07grub-config @@ -17,6 +17,7 @@ GRUB_DISTRIBUTOR="My-distro" GRUB_CMDLINE_LINUX_DEFAULT="quiet splash" GRUB_CMDLINE_LINUX="" GRUB_GFXMODE=1440x900 +GRUB_THEME="/boot/grub/themes/peppermint/theme.txt" GRUB_DISABLE_OS_PROBER=false # GRUB configuration file path @@ -29,6 +30,12 @@ sed -i "s/^GRUB_DISTRIBUTOR=.*/GRUB_DISTRIBUTOR=\"$GRUB_DISTRIBUTOR\"/" $GRUB_CO 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 diff --git a/grub/themes/my-distro/background.png b/grub/debian/themes/my-distro/background.png similarity index 100% rename from grub/themes/my-distro/background.png rename to grub/debian/themes/my-distro/background.png diff --git a/grub/themes/my-distro/icons/4MLinux.png b/grub/debian/themes/my-distro/icons/4MLinux.png similarity index 100% rename from grub/themes/my-distro/icons/4MLinux.png rename to grub/debian/themes/my-distro/icons/4MLinux.png diff --git a/grub/themes/my-distro/icons/AlpineLinux.png b/grub/debian/themes/my-distro/icons/AlpineLinux.png similarity index 100% rename from grub/themes/my-distro/icons/AlpineLinux.png rename to grub/debian/themes/my-distro/icons/AlpineLinux.png diff --git a/grub/themes/my-distro/icons/Manjaro.i686.png b/grub/debian/themes/my-distro/icons/Manjaro.i686.png similarity index 100% rename from grub/themes/my-distro/icons/Manjaro.i686.png rename to grub/debian/themes/my-distro/icons/Manjaro.i686.png diff --git a/grub/themes/my-distro/icons/Manjaro.x86_64.png b/grub/debian/themes/my-distro/icons/Manjaro.x86_64.png similarity index 100% rename from grub/themes/my-distro/icons/Manjaro.x86_64.png rename to grub/debian/themes/my-distro/icons/Manjaro.x86_64.png diff --git a/grub/themes/my-distro/icons/SystemRescueCD.png b/grub/debian/themes/my-distro/icons/SystemRescueCD.png similarity index 100% rename from grub/themes/my-distro/icons/SystemRescueCD.png rename to grub/debian/themes/my-distro/icons/SystemRescueCD.png diff --git a/grub/themes/my-distro/icons/android.png b/grub/debian/themes/my-distro/icons/android.png similarity index 100% rename from grub/themes/my-distro/icons/android.png rename to grub/debian/themes/my-distro/icons/android.png diff --git a/grub/themes/my-distro/icons/anonymous.png b/grub/debian/themes/my-distro/icons/anonymous.png similarity index 100% rename from grub/themes/my-distro/icons/anonymous.png rename to grub/debian/themes/my-distro/icons/anonymous.png diff --git a/grub/themes/my-distro/icons/antergos.png b/grub/debian/themes/my-distro/icons/antergos.png similarity index 100% rename from grub/themes/my-distro/icons/antergos.png rename to grub/debian/themes/my-distro/icons/antergos.png diff --git a/grub/themes/my-distro/icons/arch.png b/grub/debian/themes/my-distro/icons/arch.png similarity index 100% rename from grub/themes/my-distro/icons/arch.png rename to grub/debian/themes/my-distro/icons/arch.png diff --git a/grub/themes/my-distro/icons/archlinux.png b/grub/debian/themes/my-distro/icons/archlinux.png similarity index 100% rename from grub/themes/my-distro/icons/archlinux.png rename to grub/debian/themes/my-distro/icons/archlinux.png diff --git a/grub/themes/my-distro/icons/arcolinux.png b/grub/debian/themes/my-distro/icons/arcolinux.png similarity index 100% rename from grub/themes/my-distro/icons/arcolinux.png rename to grub/debian/themes/my-distro/icons/arcolinux.png diff --git a/grub/themes/my-distro/icons/artix.png b/grub/debian/themes/my-distro/icons/artix.png similarity index 100% rename from grub/themes/my-distro/icons/artix.png rename to grub/debian/themes/my-distro/icons/artix.png diff --git a/grub/themes/my-distro/icons/bedrock.png b/grub/debian/themes/my-distro/icons/bedrock.png similarity index 100% rename from grub/themes/my-distro/icons/bedrock.png rename to grub/debian/themes/my-distro/icons/bedrock.png diff --git a/grub/themes/my-distro/icons/cancel.png b/grub/debian/themes/my-distro/icons/cancel.png similarity index 100% rename from grub/themes/my-distro/icons/cancel.png rename to grub/debian/themes/my-distro/icons/cancel.png diff --git a/grub/themes/my-distro/icons/centos.png b/grub/debian/themes/my-distro/icons/centos.png similarity index 100% rename from grub/themes/my-distro/icons/centos.png rename to grub/debian/themes/my-distro/icons/centos.png diff --git a/grub/themes/my-distro/icons/chakra.png b/grub/debian/themes/my-distro/icons/chakra.png similarity index 100% rename from grub/themes/my-distro/icons/chakra.png rename to grub/debian/themes/my-distro/icons/chakra.png diff --git a/grub/themes/my-distro/icons/debian.png b/grub/debian/themes/my-distro/icons/debian.png similarity index 100% rename from grub/themes/my-distro/icons/debian.png rename to grub/debian/themes/my-distro/icons/debian.png diff --git a/grub/themes/my-distro/icons/deepin.png b/grub/debian/themes/my-distro/icons/deepin.png similarity index 100% rename from grub/themes/my-distro/icons/deepin.png rename to grub/debian/themes/my-distro/icons/deepin.png diff --git a/grub/themes/my-distro/icons/devuan.png b/grub/debian/themes/my-distro/icons/devuan.png similarity index 100% rename from grub/themes/my-distro/icons/devuan.png rename to grub/debian/themes/my-distro/icons/devuan.png diff --git a/grub/themes/my-distro/icons/driver.png b/grub/debian/themes/my-distro/icons/driver.png similarity index 100% rename from grub/themes/my-distro/icons/driver.png rename to grub/debian/themes/my-distro/icons/driver.png diff --git a/grub/themes/my-distro/icons/edit.png b/grub/debian/themes/my-distro/icons/edit.png similarity index 100% rename from grub/themes/my-distro/icons/edit.png rename to grub/debian/themes/my-distro/icons/edit.png diff --git a/grub/themes/my-distro/icons/efi.png b/grub/debian/themes/my-distro/icons/efi.png similarity index 100% rename from grub/themes/my-distro/icons/efi.png rename to grub/debian/themes/my-distro/icons/efi.png diff --git a/grub/themes/my-distro/icons/elementary.png b/grub/debian/themes/my-distro/icons/elementary.png similarity index 100% rename from grub/themes/my-distro/icons/elementary.png rename to grub/debian/themes/my-distro/icons/elementary.png diff --git a/grub/themes/my-distro/icons/endeavouros.png b/grub/debian/themes/my-distro/icons/endeavouros.png similarity index 100% rename from grub/themes/my-distro/icons/endeavouros.png rename to grub/debian/themes/my-distro/icons/endeavouros.png diff --git a/grub/themes/my-distro/icons/fedora.png b/grub/debian/themes/my-distro/icons/fedora.png similarity index 100% rename from grub/themes/my-distro/icons/fedora.png rename to grub/debian/themes/my-distro/icons/fedora.png diff --git a/grub/themes/my-distro/icons/find.efi.png b/grub/debian/themes/my-distro/icons/find.efi.png similarity index 100% rename from grub/themes/my-distro/icons/find.efi.png rename to grub/debian/themes/my-distro/icons/find.efi.png diff --git a/grub/themes/my-distro/icons/find.none.png b/grub/debian/themes/my-distro/icons/find.none.png similarity index 100% rename from grub/themes/my-distro/icons/find.none.png rename to grub/debian/themes/my-distro/icons/find.none.png diff --git a/grub/themes/my-distro/icons/freebsd.png b/grub/debian/themes/my-distro/icons/freebsd.png similarity index 100% rename from grub/themes/my-distro/icons/freebsd.png rename to grub/debian/themes/my-distro/icons/freebsd.png diff --git a/grub/themes/my-distro/icons/garuda.png b/grub/debian/themes/my-distro/icons/garuda.png similarity index 100% rename from grub/themes/my-distro/icons/garuda.png rename to grub/debian/themes/my-distro/icons/garuda.png diff --git a/grub/themes/my-distro/icons/gentoo.png b/grub/debian/themes/my-distro/icons/gentoo.png similarity index 100% rename from grub/themes/my-distro/icons/gentoo.png rename to grub/debian/themes/my-distro/icons/gentoo.png diff --git a/grub/themes/my-distro/icons/gnu-linux.png b/grub/debian/themes/my-distro/icons/gnu-linux.png similarity index 100% rename from grub/themes/my-distro/icons/gnu-linux.png rename to grub/debian/themes/my-distro/icons/gnu-linux.png diff --git a/grub/themes/my-distro/icons/haiku.png b/grub/debian/themes/my-distro/icons/haiku.png similarity index 100% rename from grub/themes/my-distro/icons/haiku.png rename to grub/debian/themes/my-distro/icons/haiku.png diff --git a/grub/themes/my-distro/icons/help.png b/grub/debian/themes/my-distro/icons/help.png similarity index 100% rename from grub/themes/my-distro/icons/help.png rename to grub/debian/themes/my-distro/icons/help.png diff --git a/grub/themes/my-distro/icons/kali.png b/grub/debian/themes/my-distro/icons/kali.png similarity index 100% rename from grub/themes/my-distro/icons/kali.png rename to grub/debian/themes/my-distro/icons/kali.png diff --git a/grub/themes/my-distro/icons/kaos.png b/grub/debian/themes/my-distro/icons/kaos.png similarity index 100% rename from grub/themes/my-distro/icons/kaos.png rename to grub/debian/themes/my-distro/icons/kaos.png diff --git a/grub/themes/my-distro/icons/kbd.png b/grub/debian/themes/my-distro/icons/kbd.png similarity index 100% rename from grub/themes/my-distro/icons/kbd.png rename to grub/debian/themes/my-distro/icons/kbd.png diff --git a/grub/themes/my-distro/icons/korora.png b/grub/debian/themes/my-distro/icons/korora.png similarity index 100% rename from grub/themes/my-distro/icons/korora.png rename to grub/debian/themes/my-distro/icons/korora.png diff --git a/grub/themes/my-distro/icons/kubuntu.png b/grub/debian/themes/my-distro/icons/kubuntu.png similarity index 100% rename from grub/themes/my-distro/icons/kubuntu.png rename to grub/debian/themes/my-distro/icons/kubuntu.png diff --git a/grub/themes/my-distro/icons/lang.png b/grub/debian/themes/my-distro/icons/lang.png similarity index 100% rename from grub/themes/my-distro/icons/lang.png rename to grub/debian/themes/my-distro/icons/lang.png diff --git a/grub/themes/my-distro/icons/lfs.png b/grub/debian/themes/my-distro/icons/lfs.png similarity index 100% rename from grub/themes/my-distro/icons/lfs.png rename to grub/debian/themes/my-distro/icons/lfs.png diff --git a/grub/themes/my-distro/icons/linux.png b/grub/debian/themes/my-distro/icons/linux.png similarity index 100% rename from grub/themes/my-distro/icons/linux.png rename to grub/debian/themes/my-distro/icons/linux.png diff --git a/grub/themes/my-distro/icons/linuxmint.png b/grub/debian/themes/my-distro/icons/linuxmint.png similarity index 100% rename from grub/themes/my-distro/icons/linuxmint.png rename to grub/debian/themes/my-distro/icons/linuxmint.png diff --git a/grub/themes/my-distro/icons/lubuntu.png b/grub/debian/themes/my-distro/icons/lubuntu.png similarity index 100% rename from grub/themes/my-distro/icons/lubuntu.png rename to grub/debian/themes/my-distro/icons/lubuntu.png diff --git a/grub/themes/my-distro/icons/macosx.png b/grub/debian/themes/my-distro/icons/macosx.png similarity index 100% rename from grub/themes/my-distro/icons/macosx.png rename to grub/debian/themes/my-distro/icons/macosx.png diff --git a/grub/themes/my-distro/icons/mageia.png b/grub/debian/themes/my-distro/icons/mageia.png similarity index 100% rename from grub/themes/my-distro/icons/mageia.png rename to grub/debian/themes/my-distro/icons/mageia.png diff --git a/grub/themes/my-distro/icons/manjaro.png b/grub/debian/themes/my-distro/icons/manjaro.png similarity index 100% rename from grub/themes/my-distro/icons/manjaro.png rename to grub/debian/themes/my-distro/icons/manjaro.png diff --git a/grub/themes/my-distro/icons/mate.png b/grub/debian/themes/my-distro/icons/mate.png similarity index 100% rename from grub/themes/my-distro/icons/mate.png rename to grub/debian/themes/my-distro/icons/mate.png diff --git a/grub/themes/my-distro/icons/memtest.png b/grub/debian/themes/my-distro/icons/memtest.png similarity index 100% rename from grub/themes/my-distro/icons/memtest.png rename to grub/debian/themes/my-distro/icons/memtest.png diff --git a/grub/themes/my-distro/icons/mx-linux.png b/grub/debian/themes/my-distro/icons/mx-linux.png similarity index 100% rename from grub/themes/my-distro/icons/mx-linux.png rename to grub/debian/themes/my-distro/icons/mx-linux.png diff --git a/grub/themes/my-distro/icons/neon.png b/grub/debian/themes/my-distro/icons/neon.png similarity index 100% rename from grub/themes/my-distro/icons/neon.png rename to grub/debian/themes/my-distro/icons/neon.png diff --git a/grub/themes/my-distro/icons/opensuse.png b/grub/debian/themes/my-distro/icons/opensuse.png similarity index 100% rename from grub/themes/my-distro/icons/opensuse.png rename to grub/debian/themes/my-distro/icons/opensuse.png diff --git a/grub/themes/my-distro/icons/parrot.png b/grub/debian/themes/my-distro/icons/parrot.png similarity index 100% rename from grub/themes/my-distro/icons/parrot.png rename to grub/debian/themes/my-distro/icons/parrot.png diff --git a/grub/themes/my-distro/icons/pop-os.png b/grub/debian/themes/my-distro/icons/pop-os.png similarity index 100% rename from grub/themes/my-distro/icons/pop-os.png rename to grub/debian/themes/my-distro/icons/pop-os.png diff --git a/grub/themes/my-distro/icons/pop.png b/grub/debian/themes/my-distro/icons/pop.png similarity index 100% rename from grub/themes/my-distro/icons/pop.png rename to grub/debian/themes/my-distro/icons/pop.png diff --git a/grub/themes/my-distro/icons/recovery.png b/grub/debian/themes/my-distro/icons/recovery.png similarity index 100% rename from grub/themes/my-distro/icons/recovery.png rename to grub/debian/themes/my-distro/icons/recovery.png diff --git a/grub/themes/my-distro/icons/regolith.png b/grub/debian/themes/my-distro/icons/regolith.png similarity index 100% rename from grub/themes/my-distro/icons/regolith.png rename to grub/debian/themes/my-distro/icons/regolith.png diff --git a/grub/themes/my-distro/icons/restart.png b/grub/debian/themes/my-distro/icons/restart.png similarity index 100% rename from grub/themes/my-distro/icons/restart.png rename to grub/debian/themes/my-distro/icons/restart.png diff --git a/grub/themes/my-distro/icons/rocky.png b/grub/debian/themes/my-distro/icons/rocky.png similarity index 100% rename from grub/themes/my-distro/icons/rocky.png rename to grub/debian/themes/my-distro/icons/rocky.png diff --git a/grub/themes/my-distro/icons/shutdown.png b/grub/debian/themes/my-distro/icons/shutdown.png similarity index 100% rename from grub/themes/my-distro/icons/shutdown.png rename to grub/debian/themes/my-distro/icons/shutdown.png diff --git a/grub/themes/my-distro/icons/siduction.png b/grub/debian/themes/my-distro/icons/siduction.png similarity index 100% rename from grub/themes/my-distro/icons/siduction.png rename to grub/debian/themes/my-distro/icons/siduction.png diff --git a/grub/themes/my-distro/icons/slackware.png b/grub/debian/themes/my-distro/icons/slackware.png similarity index 100% rename from grub/themes/my-distro/icons/slackware.png rename to grub/debian/themes/my-distro/icons/slackware.png diff --git a/grub/themes/my-distro/icons/solus.png b/grub/debian/themes/my-distro/icons/solus.png similarity index 100% rename from grub/themes/my-distro/icons/solus.png rename to grub/debian/themes/my-distro/icons/solus.png diff --git a/grub/themes/my-distro/icons/steamos.png b/grub/debian/themes/my-distro/icons/steamos.png similarity index 100% rename from grub/themes/my-distro/icons/steamos.png rename to grub/debian/themes/my-distro/icons/steamos.png diff --git a/grub/themes/my-distro/icons/type.png b/grub/debian/themes/my-distro/icons/type.png similarity index 100% rename from grub/themes/my-distro/icons/type.png rename to grub/debian/themes/my-distro/icons/type.png diff --git a/grub/themes/my-distro/icons/tz.png b/grub/debian/themes/my-distro/icons/tz.png similarity index 100% rename from grub/themes/my-distro/icons/tz.png rename to grub/debian/themes/my-distro/icons/tz.png diff --git a/grub/themes/my-distro/icons/ubuntu.png b/grub/debian/themes/my-distro/icons/ubuntu.png similarity index 100% rename from grub/themes/my-distro/icons/ubuntu.png rename to grub/debian/themes/my-distro/icons/ubuntu.png diff --git a/grub/themes/my-distro/icons/unknown.png b/grub/debian/themes/my-distro/icons/unknown.png similarity index 100% rename from grub/themes/my-distro/icons/unknown.png rename to grub/debian/themes/my-distro/icons/unknown.png diff --git a/grub/themes/my-distro/icons/unset.png b/grub/debian/themes/my-distro/icons/unset.png similarity index 100% rename from grub/themes/my-distro/icons/unset.png rename to grub/debian/themes/my-distro/icons/unset.png diff --git a/grub/themes/my-distro/icons/ventoy.png b/grub/debian/themes/my-distro/icons/ventoy.png similarity index 100% rename from grub/themes/my-distro/icons/ventoy.png rename to grub/debian/themes/my-distro/icons/ventoy.png diff --git a/grub/themes/my-distro/icons/void.png b/grub/debian/themes/my-distro/icons/void.png similarity index 100% rename from grub/themes/my-distro/icons/void.png rename to grub/debian/themes/my-distro/icons/void.png diff --git a/grub/themes/my-distro/icons/windows.png b/grub/debian/themes/my-distro/icons/windows.png similarity index 100% rename from grub/themes/my-distro/icons/windows.png rename to grub/debian/themes/my-distro/icons/windows.png diff --git a/grub/themes/my-distro/icons/windows11.png b/grub/debian/themes/my-distro/icons/windows11.png similarity index 100% rename from grub/themes/my-distro/icons/windows11.png rename to grub/debian/themes/my-distro/icons/windows11.png diff --git a/grub/themes/my-distro/icons/xero.png b/grub/debian/themes/my-distro/icons/xero.png similarity index 100% rename from grub/themes/my-distro/icons/xero.png rename to grub/debian/themes/my-distro/icons/xero.png diff --git a/grub/themes/my-distro/icons/xerolinux.png b/grub/debian/themes/my-distro/icons/xerolinux.png similarity index 100% rename from grub/themes/my-distro/icons/xerolinux.png rename to grub/debian/themes/my-distro/icons/xerolinux.png diff --git a/grub/themes/my-distro/icons/xubuntu.png b/grub/debian/themes/my-distro/icons/xubuntu.png similarity index 100% rename from grub/themes/my-distro/icons/xubuntu.png rename to grub/debian/themes/my-distro/icons/xubuntu.png diff --git a/grub/themes/my-distro/icons/zorin.png b/grub/debian/themes/my-distro/icons/zorin.png similarity index 100% rename from grub/themes/my-distro/icons/zorin.png rename to grub/debian/themes/my-distro/icons/zorin.png diff --git a/grub/themes/my-distro/select_c.png b/grub/debian/themes/my-distro/select_c.png similarity index 100% rename from grub/themes/my-distro/select_c.png rename to grub/debian/themes/my-distro/select_c.png diff --git a/grub/themes/my-distro/select_e.png b/grub/debian/themes/my-distro/select_e.png similarity index 100% rename from grub/themes/my-distro/select_e.png rename to grub/debian/themes/my-distro/select_e.png diff --git a/grub/themes/my-distro/select_w.png b/grub/debian/themes/my-distro/select_w.png similarity index 100% rename from grub/themes/my-distro/select_w.png rename to grub/debian/themes/my-distro/select_w.png diff --git a/grub/themes/my-distro/terminal_box_c.png b/grub/debian/themes/my-distro/terminal_box_c.png similarity index 100% rename from grub/themes/my-distro/terminal_box_c.png rename to grub/debian/themes/my-distro/terminal_box_c.png diff --git a/grub/themes/my-distro/terminal_box_e.png b/grub/debian/themes/my-distro/terminal_box_e.png similarity index 100% rename from grub/themes/my-distro/terminal_box_e.png rename to grub/debian/themes/my-distro/terminal_box_e.png diff --git a/grub/themes/my-distro/terminal_box_n.png b/grub/debian/themes/my-distro/terminal_box_n.png similarity index 100% rename from grub/themes/my-distro/terminal_box_n.png rename to grub/debian/themes/my-distro/terminal_box_n.png diff --git a/grub/themes/my-distro/terminal_box_ne.png b/grub/debian/themes/my-distro/terminal_box_ne.png similarity index 100% rename from grub/themes/my-distro/terminal_box_ne.png rename to grub/debian/themes/my-distro/terminal_box_ne.png diff --git a/grub/themes/my-distro/terminal_box_nw.png b/grub/debian/themes/my-distro/terminal_box_nw.png similarity index 100% rename from grub/themes/my-distro/terminal_box_nw.png rename to grub/debian/themes/my-distro/terminal_box_nw.png diff --git a/grub/themes/my-distro/terminal_box_s.png b/grub/debian/themes/my-distro/terminal_box_s.png similarity index 100% rename from grub/themes/my-distro/terminal_box_s.png rename to grub/debian/themes/my-distro/terminal_box_s.png diff --git a/grub/themes/my-distro/terminal_box_se.png b/grub/debian/themes/my-distro/terminal_box_se.png similarity index 100% rename from grub/themes/my-distro/terminal_box_se.png rename to grub/debian/themes/my-distro/terminal_box_se.png diff --git a/grub/themes/my-distro/terminal_box_sw.png b/grub/debian/themes/my-distro/terminal_box_sw.png similarity index 100% rename from grub/themes/my-distro/terminal_box_sw.png rename to grub/debian/themes/my-distro/terminal_box_sw.png diff --git a/grub/themes/my-distro/terminal_box_w.png b/grub/debian/themes/my-distro/terminal_box_w.png similarity index 100% rename from grub/themes/my-distro/terminal_box_w.png rename to grub/debian/themes/my-distro/terminal_box_w.png diff --git a/grub/themes/my-distro/terminus-12.pf2 b/grub/debian/themes/my-distro/terminus-12.pf2 similarity index 100% rename from grub/themes/my-distro/terminus-12.pf2 rename to grub/debian/themes/my-distro/terminus-12.pf2 diff --git a/grub/themes/my-distro/terminus-14.pf2 b/grub/debian/themes/my-distro/terminus-14.pf2 similarity index 100% rename from grub/themes/my-distro/terminus-14.pf2 rename to grub/debian/themes/my-distro/terminus-14.pf2 diff --git a/grub/themes/my-distro/terminus-16.pf2 b/grub/debian/themes/my-distro/terminus-16.pf2 similarity index 100% rename from grub/themes/my-distro/terminus-16.pf2 rename to grub/debian/themes/my-distro/terminus-16.pf2 diff --git a/grub/themes/my-distro/terminus-18.pf2 b/grub/debian/themes/my-distro/terminus-18.pf2 similarity index 100% rename from grub/themes/my-distro/terminus-18.pf2 rename to grub/debian/themes/my-distro/terminus-18.pf2 diff --git a/grub/themes/my-distro/theme.txt b/grub/debian/themes/my-distro/theme.txt similarity index 100% rename from grub/themes/my-distro/theme.txt rename to grub/debian/themes/my-distro/theme.txt diff --git a/grub/themes/my-distro/ubuntu_regular_17.pf2 b/grub/debian/themes/my-distro/ubuntu_regular_17.pf2 similarity index 100% rename from grub/themes/my-distro/ubuntu_regular_17.pf2 rename to grub/debian/themes/my-distro/ubuntu_regular_17.pf2 diff --git a/grub/themes/my-distro/ubuntu_regular_20.pf2 b/grub/debian/themes/my-distro/ubuntu_regular_20.pf2 similarity index 100% rename from grub/themes/my-distro/ubuntu_regular_20.pf2 rename to grub/debian/themes/my-distro/ubuntu_regular_20.pf2 diff --git a/my-distro-devuan-32-pae/grub/grub b/grub/devuan/grub similarity index 100% rename from my-distro-devuan-32-pae/grub/grub rename to grub/devuan/grub diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/background.png b/grub/devuan/themes/my-distro/background.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/background.png rename to grub/devuan/themes/my-distro/background.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/4MLinux.png b/grub/devuan/themes/my-distro/icons/4MLinux.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/4MLinux.png rename to grub/devuan/themes/my-distro/icons/4MLinux.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/AlpineLinux.png b/grub/devuan/themes/my-distro/icons/AlpineLinux.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/AlpineLinux.png rename to grub/devuan/themes/my-distro/icons/AlpineLinux.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/Manjaro.i686.png b/grub/devuan/themes/my-distro/icons/Manjaro.i686.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/Manjaro.i686.png rename to grub/devuan/themes/my-distro/icons/Manjaro.i686.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/Manjaro.x86_64.png b/grub/devuan/themes/my-distro/icons/Manjaro.x86_64.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/Manjaro.x86_64.png rename to grub/devuan/themes/my-distro/icons/Manjaro.x86_64.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/SystemRescueCD.png b/grub/devuan/themes/my-distro/icons/SystemRescueCD.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/SystemRescueCD.png rename to grub/devuan/themes/my-distro/icons/SystemRescueCD.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/android.png b/grub/devuan/themes/my-distro/icons/android.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/android.png rename to grub/devuan/themes/my-distro/icons/android.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/anonymous.png b/grub/devuan/themes/my-distro/icons/anonymous.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/anonymous.png rename to grub/devuan/themes/my-distro/icons/anonymous.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/antergos.png b/grub/devuan/themes/my-distro/icons/antergos.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/antergos.png rename to grub/devuan/themes/my-distro/icons/antergos.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/arch.png b/grub/devuan/themes/my-distro/icons/arch.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/arch.png rename to grub/devuan/themes/my-distro/icons/arch.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/archlinux.png b/grub/devuan/themes/my-distro/icons/archlinux.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/archlinux.png rename to grub/devuan/themes/my-distro/icons/archlinux.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/arcolinux.png b/grub/devuan/themes/my-distro/icons/arcolinux.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/arcolinux.png rename to grub/devuan/themes/my-distro/icons/arcolinux.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/artix.png b/grub/devuan/themes/my-distro/icons/artix.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/artix.png rename to grub/devuan/themes/my-distro/icons/artix.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/bedrock.png b/grub/devuan/themes/my-distro/icons/bedrock.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/bedrock.png rename to grub/devuan/themes/my-distro/icons/bedrock.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/cancel.png b/grub/devuan/themes/my-distro/icons/cancel.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/cancel.png rename to grub/devuan/themes/my-distro/icons/cancel.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/centos.png b/grub/devuan/themes/my-distro/icons/centos.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/centos.png rename to grub/devuan/themes/my-distro/icons/centos.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/chakra.png b/grub/devuan/themes/my-distro/icons/chakra.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/chakra.png rename to grub/devuan/themes/my-distro/icons/chakra.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/debian.png b/grub/devuan/themes/my-distro/icons/debian.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/debian.png rename to grub/devuan/themes/my-distro/icons/debian.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/deepin.png b/grub/devuan/themes/my-distro/icons/deepin.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/deepin.png rename to grub/devuan/themes/my-distro/icons/deepin.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/devuan.png b/grub/devuan/themes/my-distro/icons/devuan.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/devuan.png rename to grub/devuan/themes/my-distro/icons/devuan.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/driver.png b/grub/devuan/themes/my-distro/icons/driver.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/driver.png rename to grub/devuan/themes/my-distro/icons/driver.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/edit.png b/grub/devuan/themes/my-distro/icons/edit.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/edit.png rename to grub/devuan/themes/my-distro/icons/edit.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/efi.png b/grub/devuan/themes/my-distro/icons/efi.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/efi.png rename to grub/devuan/themes/my-distro/icons/efi.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/elementary.png b/grub/devuan/themes/my-distro/icons/elementary.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/elementary.png rename to grub/devuan/themes/my-distro/icons/elementary.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/endeavouros.png b/grub/devuan/themes/my-distro/icons/endeavouros.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/endeavouros.png rename to grub/devuan/themes/my-distro/icons/endeavouros.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/fedora.png b/grub/devuan/themes/my-distro/icons/fedora.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/fedora.png rename to grub/devuan/themes/my-distro/icons/fedora.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/find.efi.png b/grub/devuan/themes/my-distro/icons/find.efi.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/find.efi.png rename to grub/devuan/themes/my-distro/icons/find.efi.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/find.none.png b/grub/devuan/themes/my-distro/icons/find.none.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/find.none.png rename to grub/devuan/themes/my-distro/icons/find.none.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/freebsd.png b/grub/devuan/themes/my-distro/icons/freebsd.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/freebsd.png rename to grub/devuan/themes/my-distro/icons/freebsd.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/garuda.png b/grub/devuan/themes/my-distro/icons/garuda.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/garuda.png rename to grub/devuan/themes/my-distro/icons/garuda.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/gentoo.png b/grub/devuan/themes/my-distro/icons/gentoo.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/gentoo.png rename to grub/devuan/themes/my-distro/icons/gentoo.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/gnu-linux.png b/grub/devuan/themes/my-distro/icons/gnu-linux.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/gnu-linux.png rename to grub/devuan/themes/my-distro/icons/gnu-linux.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/haiku.png b/grub/devuan/themes/my-distro/icons/haiku.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/haiku.png rename to grub/devuan/themes/my-distro/icons/haiku.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/help.png b/grub/devuan/themes/my-distro/icons/help.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/help.png rename to grub/devuan/themes/my-distro/icons/help.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/kali.png b/grub/devuan/themes/my-distro/icons/kali.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/kali.png rename to grub/devuan/themes/my-distro/icons/kali.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/kaos.png b/grub/devuan/themes/my-distro/icons/kaos.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/kaos.png rename to grub/devuan/themes/my-distro/icons/kaos.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/kbd.png b/grub/devuan/themes/my-distro/icons/kbd.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/kbd.png rename to grub/devuan/themes/my-distro/icons/kbd.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/korora.png b/grub/devuan/themes/my-distro/icons/korora.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/korora.png rename to grub/devuan/themes/my-distro/icons/korora.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/kubuntu.png b/grub/devuan/themes/my-distro/icons/kubuntu.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/kubuntu.png rename to grub/devuan/themes/my-distro/icons/kubuntu.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/lang.png b/grub/devuan/themes/my-distro/icons/lang.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/lang.png rename to grub/devuan/themes/my-distro/icons/lang.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/lfs.png b/grub/devuan/themes/my-distro/icons/lfs.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/lfs.png rename to grub/devuan/themes/my-distro/icons/lfs.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/linux.png b/grub/devuan/themes/my-distro/icons/linux.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/linux.png rename to grub/devuan/themes/my-distro/icons/linux.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/linuxmint.png b/grub/devuan/themes/my-distro/icons/linuxmint.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/linuxmint.png rename to grub/devuan/themes/my-distro/icons/linuxmint.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/lubuntu.png b/grub/devuan/themes/my-distro/icons/lubuntu.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/lubuntu.png rename to grub/devuan/themes/my-distro/icons/lubuntu.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/macosx.png b/grub/devuan/themes/my-distro/icons/macosx.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/macosx.png rename to grub/devuan/themes/my-distro/icons/macosx.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/mageia.png b/grub/devuan/themes/my-distro/icons/mageia.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/mageia.png rename to grub/devuan/themes/my-distro/icons/mageia.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/manjaro.png b/grub/devuan/themes/my-distro/icons/manjaro.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/manjaro.png rename to grub/devuan/themes/my-distro/icons/manjaro.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/mate.png b/grub/devuan/themes/my-distro/icons/mate.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/mate.png rename to grub/devuan/themes/my-distro/icons/mate.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/memtest.png b/grub/devuan/themes/my-distro/icons/memtest.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/memtest.png rename to grub/devuan/themes/my-distro/icons/memtest.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/mx-linux.png b/grub/devuan/themes/my-distro/icons/mx-linux.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/mx-linux.png rename to grub/devuan/themes/my-distro/icons/mx-linux.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/neon.png b/grub/devuan/themes/my-distro/icons/neon.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/neon.png rename to grub/devuan/themes/my-distro/icons/neon.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/opensuse.png b/grub/devuan/themes/my-distro/icons/opensuse.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/opensuse.png rename to grub/devuan/themes/my-distro/icons/opensuse.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/parrot.png b/grub/devuan/themes/my-distro/icons/parrot.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/parrot.png rename to grub/devuan/themes/my-distro/icons/parrot.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/pop-os.png b/grub/devuan/themes/my-distro/icons/pop-os.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/pop-os.png rename to grub/devuan/themes/my-distro/icons/pop-os.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/pop.png b/grub/devuan/themes/my-distro/icons/pop.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/pop.png rename to grub/devuan/themes/my-distro/icons/pop.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/recovery.png b/grub/devuan/themes/my-distro/icons/recovery.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/recovery.png rename to grub/devuan/themes/my-distro/icons/recovery.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/regolith.png b/grub/devuan/themes/my-distro/icons/regolith.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/regolith.png rename to grub/devuan/themes/my-distro/icons/regolith.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/restart.png b/grub/devuan/themes/my-distro/icons/restart.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/restart.png rename to grub/devuan/themes/my-distro/icons/restart.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/rocky.png b/grub/devuan/themes/my-distro/icons/rocky.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/rocky.png rename to grub/devuan/themes/my-distro/icons/rocky.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/shutdown.png b/grub/devuan/themes/my-distro/icons/shutdown.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/shutdown.png rename to grub/devuan/themes/my-distro/icons/shutdown.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/siduction.png b/grub/devuan/themes/my-distro/icons/siduction.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/siduction.png rename to grub/devuan/themes/my-distro/icons/siduction.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/slackware.png b/grub/devuan/themes/my-distro/icons/slackware.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/slackware.png rename to grub/devuan/themes/my-distro/icons/slackware.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/solus.png b/grub/devuan/themes/my-distro/icons/solus.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/solus.png rename to grub/devuan/themes/my-distro/icons/solus.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/steamos.png b/grub/devuan/themes/my-distro/icons/steamos.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/steamos.png rename to grub/devuan/themes/my-distro/icons/steamos.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/type.png b/grub/devuan/themes/my-distro/icons/type.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/type.png rename to grub/devuan/themes/my-distro/icons/type.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/tz.png b/grub/devuan/themes/my-distro/icons/tz.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/tz.png rename to grub/devuan/themes/my-distro/icons/tz.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/ubuntu.png b/grub/devuan/themes/my-distro/icons/ubuntu.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/ubuntu.png rename to grub/devuan/themes/my-distro/icons/ubuntu.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/unknown.png b/grub/devuan/themes/my-distro/icons/unknown.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/unknown.png rename to grub/devuan/themes/my-distro/icons/unknown.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/unset.png b/grub/devuan/themes/my-distro/icons/unset.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/unset.png rename to grub/devuan/themes/my-distro/icons/unset.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/ventoy.png b/grub/devuan/themes/my-distro/icons/ventoy.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/ventoy.png rename to grub/devuan/themes/my-distro/icons/ventoy.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/void.png b/grub/devuan/themes/my-distro/icons/void.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/void.png rename to grub/devuan/themes/my-distro/icons/void.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/windows.png b/grub/devuan/themes/my-distro/icons/windows.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/windows.png rename to grub/devuan/themes/my-distro/icons/windows.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/windows11.png b/grub/devuan/themes/my-distro/icons/windows11.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/windows11.png rename to grub/devuan/themes/my-distro/icons/windows11.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/xero.png b/grub/devuan/themes/my-distro/icons/xero.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/xero.png rename to grub/devuan/themes/my-distro/icons/xero.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/xerolinux.png b/grub/devuan/themes/my-distro/icons/xerolinux.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/xerolinux.png rename to grub/devuan/themes/my-distro/icons/xerolinux.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/xubuntu.png b/grub/devuan/themes/my-distro/icons/xubuntu.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/xubuntu.png rename to grub/devuan/themes/my-distro/icons/xubuntu.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/icons/zorin.png b/grub/devuan/themes/my-distro/icons/zorin.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/icons/zorin.png rename to grub/devuan/themes/my-distro/icons/zorin.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/select_c.png b/grub/devuan/themes/my-distro/select_c.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/select_c.png rename to grub/devuan/themes/my-distro/select_c.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/select_e.png b/grub/devuan/themes/my-distro/select_e.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/select_e.png rename to grub/devuan/themes/my-distro/select_e.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/select_w.png b/grub/devuan/themes/my-distro/select_w.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/select_w.png rename to grub/devuan/themes/my-distro/select_w.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/terminal_box_c.png b/grub/devuan/themes/my-distro/terminal_box_c.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/terminal_box_c.png rename to grub/devuan/themes/my-distro/terminal_box_c.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/terminal_box_e.png b/grub/devuan/themes/my-distro/terminal_box_e.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/terminal_box_e.png rename to grub/devuan/themes/my-distro/terminal_box_e.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/terminal_box_n.png b/grub/devuan/themes/my-distro/terminal_box_n.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/terminal_box_n.png rename to grub/devuan/themes/my-distro/terminal_box_n.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/terminal_box_ne.png b/grub/devuan/themes/my-distro/terminal_box_ne.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/terminal_box_ne.png rename to grub/devuan/themes/my-distro/terminal_box_ne.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/terminal_box_nw.png b/grub/devuan/themes/my-distro/terminal_box_nw.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/terminal_box_nw.png rename to grub/devuan/themes/my-distro/terminal_box_nw.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/terminal_box_s.png b/grub/devuan/themes/my-distro/terminal_box_s.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/terminal_box_s.png rename to grub/devuan/themes/my-distro/terminal_box_s.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/terminal_box_se.png b/grub/devuan/themes/my-distro/terminal_box_se.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/terminal_box_se.png rename to grub/devuan/themes/my-distro/terminal_box_se.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/terminal_box_sw.png b/grub/devuan/themes/my-distro/terminal_box_sw.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/terminal_box_sw.png rename to grub/devuan/themes/my-distro/terminal_box_sw.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/terminal_box_w.png b/grub/devuan/themes/my-distro/terminal_box_w.png similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/terminal_box_w.png rename to grub/devuan/themes/my-distro/terminal_box_w.png diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/terminus-12.pf2 b/grub/devuan/themes/my-distro/terminus-12.pf2 similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/terminus-12.pf2 rename to grub/devuan/themes/my-distro/terminus-12.pf2 diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/terminus-14.pf2 b/grub/devuan/themes/my-distro/terminus-14.pf2 similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/terminus-14.pf2 rename to grub/devuan/themes/my-distro/terminus-14.pf2 diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/terminus-16.pf2 b/grub/devuan/themes/my-distro/terminus-16.pf2 similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/terminus-16.pf2 rename to grub/devuan/themes/my-distro/terminus-16.pf2 diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/terminus-18.pf2 b/grub/devuan/themes/my-distro/terminus-18.pf2 similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/terminus-18.pf2 rename to grub/devuan/themes/my-distro/terminus-18.pf2 diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/theme.txt b/grub/devuan/themes/my-distro/theme.txt similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/theme.txt rename to grub/devuan/themes/my-distro/theme.txt diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/ubuntu_regular_17.pf2 b/grub/devuan/themes/my-distro/ubuntu_regular_17.pf2 similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/ubuntu_regular_17.pf2 rename to grub/devuan/themes/my-distro/ubuntu_regular_17.pf2 diff --git a/my-distro-devuan-32-pae/grub/themes/my-distro/ubuntu_regular_20.pf2 b/grub/devuan/themes/my-distro/ubuntu_regular_20.pf2 similarity index 100% rename from my-distro-devuan-32-pae/grub/themes/my-distro/ubuntu_regular_20.pf2 rename to grub/devuan/themes/my-distro/ubuntu_regular_20.pf2 diff --git a/my-distro-debian-32-pae/build.sh b/my-distro-debian-32-pae/build.sh index 3e250375..56f6c9a6 100755 --- a/my-distro-debian-32-pae/build.sh +++ b/my-distro-debian-32-pae/build.sh @@ -245,9 +245,10 @@ 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/etc/skel/Desktop -mkdir -p $build/build/config/includes.chroot/boot/grub +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.installer/usr/lib/finish-install.d -mkdir -p $build/build/config/includes.installer//usr/share +mkdir -p $build/build/config/includes.installer/usr/share # Copy Configs to the chroot cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d @@ -256,6 +257,7 @@ cp $build/hooks/debian/live/* $build/build/config/includes.chroot/usr/lib/live/c cp $build/hooks/debian/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/calamares/debian/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/deb-installer/debian/scripts/* $build/build/config/includes.installer/usr/lib/finish-install.d cp $build/deb-installer/debian/preseed/* $build/build/config/includes.installer @@ -267,10 +269,11 @@ cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgro cp -r $build/calamares/debian/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 -cp -r $build/grub/themes $build/build/config/includes.chroot/boot/grub +cp -r $build/grub/debian/themes/* $build/build/config/includes.chroot/boot/grub/themes +cp -r $build/grub/debian/themes $build/build/config/includes.chroot/boot/grub cp -r $build/deb-installer/debian/graphics $build/build/config/includes.installer/usr/share cp -r $build/deb-installer/debian/themes $build/build/config/includes.installer/usr/share +cp -r $build/calamares/modules/* $build/build/config/includes.chroot/usr/lib/calamares #cp -r $build/packages/* $build/build/config/packages.chroot # build the ISO # diff --git a/my-distro-debian-32/build.sh b/my-distro-debian-32/build.sh index 84876321..051205b9 100755 --- a/my-distro-debian-32/build.sh +++ b/my-distro-debian-32/build.sh @@ -247,9 +247,11 @@ 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/etc/skel/Desktop -mkdir -p $build/build/config/includes.chroot/boot/grub +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.installer/usr/lib/finish-install.d -mkdir -p $build/build/config/includes.installer//usr/share +mkdir -p $build/build/config/includes.installer/usr/share + # Copy Configs to the chroot cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d @@ -258,6 +260,7 @@ cp $build/hooks/debian/live/* $build/build/config/includes.chroot/usr/lib/live/c cp $build/hooks/debian/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/calamares/debian/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/deb-installer/debian/scripts/* $build/build/config/includes.installer/usr/lib/finish-install.d cp $build/deb-installer/debian/preseed/* $build/build/config/includes.installer @@ -270,9 +273,10 @@ cp -r $build/calamares/debian/calamares/* $build/build/config/includes.chroot/et 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 -cp -r $build/grub/themes $build/build/config/includes.chroot/boot/grub +cp -r $build/grub/debian/themes/* $build/build/config/includes.chroot/boot/grub/themes cp -r $build/deb-installer/debian/graphics $build/build/config/includes.installer/usr/share cp -r $build/deb-installer/debian/themes $build/build/config/includes.installer/usr/share +cp -r $build/calamares/modules/* $build/build/config/includes.chroot/usr/lib/calamares #cp -r $build/packages/* $build/build/config/packages.chroot # build the ISO # diff --git a/my-distro-debian-64/build.sh b/my-distro-debian-64/build.sh index 167b7580..21a8527f 100755 --- a/my-distro-debian-64/build.sh +++ b/my-distro-debian-64/build.sh @@ -246,7 +246,8 @@ 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/etc/skel/Desktop -mkdir -p $build/build/config/includes.chroot/boot/grub +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.installer/usr/lib/finish-install.d mkdir -p $build/build/config/includes.installer//usr/share @@ -258,6 +259,8 @@ cp $build/hooks/debian/normal/* $build/build/config/hooks/normal cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/calamares/debian/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/deb-installer/debian/scripts/* $build/build/config/includes.installer/usr/lib/finish-install.d cp $build/deb-installer/debian/preseed/* $build/build/config/includes.installer @@ -269,9 +272,10 @@ cp -r $build/calamares/debian/calamares/* $build/build/config/includes.chroot/et 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 -cp -r $build/grub/themes $build/build/config/includes.chroot/boot/grub +cp -r $build/grub/debian/themes/* $build/build/config/includes.chroot/boot/grub/themes cp -r $build/deb-installer/debian/graphics $build/build/config/includes.installer/usr/share cp -r $build/deb-installer/debian/themes $build/build/config/includes.installer/usr/share +cp -r $build/calamares/modules/* $build/build/config/includes.chroot/usr/lib/calamares #cp -r $build/packages/* $build/build/config/packages.chroot # build the ISO # diff --git a/my-distro-devuan-32-pae/build.sh b/my-distro-devuan-32-pae/build.sh index 783a416c..356905f9 100755 --- a/my-distro-devuan-32-pae/build.sh +++ b/my-distro-devuan-32-pae/build.sh @@ -260,6 +260,7 @@ cp $build/hooks/devuan/live/* $build/build/config/includes.chroot/usr/lib/live/c cp $build/hooks/devuan/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/calamares/devuan/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/deb-installer/devuan/scripts/* $build/build/config/includes.installer/usr/lib/finish-install.d cp $build/deb-installer/devuan/preseed/* $build/build/config/includes.installer @@ -273,9 +274,10 @@ 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 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/grub/devuan/themes/* $build/build/config/includes.chroot/boot/grub/themes cp -r $build/deb-installer/devuan/graphics $build/build/config/includes.installer/usr/share cp -r $build/deb-installer/devuan/themes $build/build/config/includes.installer/usr/share +cp -r $build/calamares/modules/* $build/build/config/includes.chroot/usr/lib/calamares #cp -r $build/packages/* $build/build/config/packages.chroot # build the ISO # diff --git a/my-distro-devuan-32-pae/grub b/my-distro-devuan-32-pae/grub new file mode 120000 index 00000000..c807ca0d --- /dev/null +++ b/my-distro-devuan-32-pae/grub @@ -0,0 +1 @@ +../grub \ No newline at end of file diff --git a/my-distro-devuan-32/build.sh b/my-distro-devuan-32/build.sh index 60add70a..bb0924e4 100755 --- a/my-distro-devuan-32/build.sh +++ b/my-distro-devuan-32/build.sh @@ -250,6 +250,7 @@ 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/etc/skel/Desktop 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.installer/usr/lib/finish-install.d mkdir -p $build/build/config/includes.installer//usr/share @@ -260,6 +261,7 @@ cp $build/hooks/devuan/live/* $build/build/config/includes.chroot/usr/lib/live/c cp $build/hooks/devuan/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/calamares/devuan/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/deb-installer/devuan/scripts/* $build/build/config/includes.installer/usr/lib/finish-install.d cp $build/deb-installer/devuan/preseed/* $build/build/config/includes.installer @@ -273,9 +275,10 @@ 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 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/grub/devuan/themes/* $build/build/config/includes.chroot/boot/grub/themes cp -r $build/deb-installer/devuan/graphics $build/build/config/includes.installer/usr/share cp -r $build/deb-installer/devuan/themes $build/build/config/includes.installer/usr/share +cp -r $build/calamares/modules/* $build/build/config/includes.chroot/usr/lib/calamares #cp -r $build/packages/* $build/build/config/packages.chroot # build the ISO # diff --git a/my-distro-devuan-32/grub b/my-distro-devuan-32/grub new file mode 120000 index 00000000..c807ca0d --- /dev/null +++ b/my-distro-devuan-32/grub @@ -0,0 +1 @@ +../grub \ No newline at end of file diff --git a/my-distro-devuan-32/grub/grub b/my-distro-devuan-32/grub/grub deleted file mode 100755 index b3636885..00000000 --- a/my-distro-devuan-32/grub/grub +++ /dev/null @@ -1,35 +0,0 @@ -# If you change this file, run 'update-grub' afterwards to update -# /boot/grub/grub.cfg. -# For full documentation of the options in this file, see: -# info -f grub -n 'Simple configuration' - -GRUB_DEFAULT=0 -GRUB_TIMEOUT=5 -GRUB_DISTRIBUTOR="My-distro" -GRUB_CMDLINE_LINUX_DEFAULT="quiet splash" -GRUB_CMDLINE_LINUX="" - -# Uncomment to enable BadRAM filtering, modify to suit your needs -# This works with Linux (no patch required) and with any kernel that obtains -# the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...) -#GRUB_BADRAM="0x01234567,0xfefefefe,0x89abcdef,0xefefefef" - -# Uncomment to disable graphical terminal (grub-pc only) -#GRUB_TERMINAL=console - -# The resolution used on graphical terminal -# note that you can use only modes which your graphic card supports via VBE -# you can see them in real GRUB with the command `vbeinfo' -GRUB_GFXMODE=1440x900 - -# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux -#GRUB_DISABLE_LINUX_UUID=true - -# Uncomment to disable generation of recovery mode menu entries -#GRUB_DISABLE_RECOVERY="true" - -# Uncomment to get a beep at grub start -#GRUB_INIT_TUNE="480 440 1" - -#Grub theme -GRUB_THEME="/boot/grub/themes/my-distro/theme.txt" diff --git a/my-distro-devuan-32/grub/themes/my-distro/background.png b/my-distro-devuan-32/grub/themes/my-distro/background.png deleted file mode 100644 index 59b84691..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/background.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/4MLinux.png b/my-distro-devuan-32/grub/themes/my-distro/icons/4MLinux.png deleted file mode 100644 index 1c6fe5e2..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/4MLinux.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/AlpineLinux.png b/my-distro-devuan-32/grub/themes/my-distro/icons/AlpineLinux.png deleted file mode 100644 index 6212a1fa..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/AlpineLinux.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/Manjaro.i686.png b/my-distro-devuan-32/grub/themes/my-distro/icons/Manjaro.i686.png deleted file mode 100644 index 611a6fbc..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/Manjaro.i686.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/Manjaro.x86_64.png b/my-distro-devuan-32/grub/themes/my-distro/icons/Manjaro.x86_64.png deleted file mode 100644 index 611a6fbc..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/Manjaro.x86_64.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/SystemRescueCD.png b/my-distro-devuan-32/grub/themes/my-distro/icons/SystemRescueCD.png deleted file mode 100644 index 7c41182f..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/SystemRescueCD.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/android.png b/my-distro-devuan-32/grub/themes/my-distro/icons/android.png deleted file mode 100644 index dad066f5..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/android.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/anonymous.png b/my-distro-devuan-32/grub/themes/my-distro/icons/anonymous.png deleted file mode 100644 index 7d165b67..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/anonymous.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/antergos.png b/my-distro-devuan-32/grub/themes/my-distro/icons/antergos.png deleted file mode 100644 index 32e3a3a3..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/antergos.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/arch.png b/my-distro-devuan-32/grub/themes/my-distro/icons/arch.png deleted file mode 100644 index f6cd8704..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/arch.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/archlinux.png b/my-distro-devuan-32/grub/themes/my-distro/icons/archlinux.png deleted file mode 100644 index f6cd8704..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/archlinux.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/arcolinux.png b/my-distro-devuan-32/grub/themes/my-distro/icons/arcolinux.png deleted file mode 100644 index c5e5e5ea..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/arcolinux.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/artix.png b/my-distro-devuan-32/grub/themes/my-distro/icons/artix.png deleted file mode 100644 index 0cbeb11c..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/artix.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/bedrock.png b/my-distro-devuan-32/grub/themes/my-distro/icons/bedrock.png deleted file mode 100644 index 58ff48a8..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/bedrock.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/cancel.png b/my-distro-devuan-32/grub/themes/my-distro/icons/cancel.png deleted file mode 100644 index fca2ac9d..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/cancel.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/centos.png b/my-distro-devuan-32/grub/themes/my-distro/icons/centos.png deleted file mode 100644 index 23fe2fa5..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/centos.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/chakra.png b/my-distro-devuan-32/grub/themes/my-distro/icons/chakra.png deleted file mode 100644 index 6f63a959..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/chakra.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/debian.png b/my-distro-devuan-32/grub/themes/my-distro/icons/debian.png deleted file mode 100644 index 20bea8c2..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/debian.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/deepin.png b/my-distro-devuan-32/grub/themes/my-distro/icons/deepin.png deleted file mode 100644 index 61c92fb4..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/deepin.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/devuan.png b/my-distro-devuan-32/grub/themes/my-distro/icons/devuan.png deleted file mode 100644 index ff654016..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/devuan.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/driver.png b/my-distro-devuan-32/grub/themes/my-distro/icons/driver.png deleted file mode 100644 index 1621ee7f..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/driver.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/edit.png b/my-distro-devuan-32/grub/themes/my-distro/icons/edit.png deleted file mode 100644 index 6a43bd99..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/edit.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/efi.png b/my-distro-devuan-32/grub/themes/my-distro/icons/efi.png deleted file mode 100644 index 4ecf3b98..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/efi.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/elementary.png b/my-distro-devuan-32/grub/themes/my-distro/icons/elementary.png deleted file mode 100644 index 2840354c..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/elementary.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/endeavouros.png b/my-distro-devuan-32/grub/themes/my-distro/icons/endeavouros.png deleted file mode 100644 index 6b1e530d..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/endeavouros.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/fedora.png b/my-distro-devuan-32/grub/themes/my-distro/icons/fedora.png deleted file mode 100644 index 926b56d1..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/fedora.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/find.efi.png b/my-distro-devuan-32/grub/themes/my-distro/icons/find.efi.png deleted file mode 100644 index 0e32321a..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/find.efi.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/find.none.png b/my-distro-devuan-32/grub/themes/my-distro/icons/find.none.png deleted file mode 100644 index 87d4d0ec..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/find.none.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/freebsd.png b/my-distro-devuan-32/grub/themes/my-distro/icons/freebsd.png deleted file mode 100644 index fb9408cf..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/freebsd.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/garuda.png b/my-distro-devuan-32/grub/themes/my-distro/icons/garuda.png deleted file mode 100644 index f699718a..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/garuda.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/gentoo.png b/my-distro-devuan-32/grub/themes/my-distro/icons/gentoo.png deleted file mode 100644 index bc0ed705..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/gentoo.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/gnu-linux.png b/my-distro-devuan-32/grub/themes/my-distro/icons/gnu-linux.png deleted file mode 100644 index 326b6596..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/gnu-linux.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/haiku.png b/my-distro-devuan-32/grub/themes/my-distro/icons/haiku.png deleted file mode 100644 index ce7f8182..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/haiku.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/help.png b/my-distro-devuan-32/grub/themes/my-distro/icons/help.png deleted file mode 100644 index d8b5a173..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/help.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/kali.png b/my-distro-devuan-32/grub/themes/my-distro/icons/kali.png deleted file mode 100644 index 900dc82e..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/kali.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/kaos.png b/my-distro-devuan-32/grub/themes/my-distro/icons/kaos.png deleted file mode 100644 index 9fd4e891..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/kaos.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/kbd.png b/my-distro-devuan-32/grub/themes/my-distro/icons/kbd.png deleted file mode 100644 index 6ace3ace..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/kbd.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/korora.png b/my-distro-devuan-32/grub/themes/my-distro/icons/korora.png deleted file mode 100644 index 456e8764..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/korora.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/kubuntu.png b/my-distro-devuan-32/grub/themes/my-distro/icons/kubuntu.png deleted file mode 100644 index 7a79ff32..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/kubuntu.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/lang.png b/my-distro-devuan-32/grub/themes/my-distro/icons/lang.png deleted file mode 100644 index 3c9c1d79..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/lang.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/lfs.png b/my-distro-devuan-32/grub/themes/my-distro/icons/lfs.png deleted file mode 100644 index 326b6596..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/lfs.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/linux.png b/my-distro-devuan-32/grub/themes/my-distro/icons/linux.png deleted file mode 100644 index 326b6596..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/linux.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/linuxmint.png b/my-distro-devuan-32/grub/themes/my-distro/icons/linuxmint.png deleted file mode 100644 index 7d9da816..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/linuxmint.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/lubuntu.png b/my-distro-devuan-32/grub/themes/my-distro/icons/lubuntu.png deleted file mode 100644 index 057c8e25..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/lubuntu.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/macosx.png b/my-distro-devuan-32/grub/themes/my-distro/icons/macosx.png deleted file mode 100644 index ea03e779..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/macosx.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/mageia.png b/my-distro-devuan-32/grub/themes/my-distro/icons/mageia.png deleted file mode 100644 index 79afa761..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/mageia.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/manjaro.png b/my-distro-devuan-32/grub/themes/my-distro/icons/manjaro.png deleted file mode 100644 index 611a6fbc..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/manjaro.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/mate.png b/my-distro-devuan-32/grub/themes/my-distro/icons/mate.png deleted file mode 100644 index b2fc22aa..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/mate.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/memtest.png b/my-distro-devuan-32/grub/themes/my-distro/icons/memtest.png deleted file mode 100644 index 1621ee7f..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/memtest.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/mx-linux.png b/my-distro-devuan-32/grub/themes/my-distro/icons/mx-linux.png deleted file mode 100644 index 49f11336..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/mx-linux.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/neon.png b/my-distro-devuan-32/grub/themes/my-distro/icons/neon.png deleted file mode 100644 index e41906e8..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/neon.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/opensuse.png b/my-distro-devuan-32/grub/themes/my-distro/icons/opensuse.png deleted file mode 100644 index d844fd5a..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/opensuse.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/parrot.png b/my-distro-devuan-32/grub/themes/my-distro/icons/parrot.png deleted file mode 100644 index 3333de91..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/parrot.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/pop-os.png b/my-distro-devuan-32/grub/themes/my-distro/icons/pop-os.png deleted file mode 100644 index 014d9f32..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/pop-os.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/pop.png b/my-distro-devuan-32/grub/themes/my-distro/icons/pop.png deleted file mode 100644 index 014d9f32..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/pop.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/recovery.png b/my-distro-devuan-32/grub/themes/my-distro/icons/recovery.png deleted file mode 100644 index 7b69b142..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/recovery.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/regolith.png b/my-distro-devuan-32/grub/themes/my-distro/icons/regolith.png deleted file mode 100644 index 5ece07ba..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/regolith.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/restart.png b/my-distro-devuan-32/grub/themes/my-distro/icons/restart.png deleted file mode 100644 index 97153021..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/restart.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/rocky.png b/my-distro-devuan-32/grub/themes/my-distro/icons/rocky.png deleted file mode 100644 index be144f6d..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/rocky.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/shutdown.png b/my-distro-devuan-32/grub/themes/my-distro/icons/shutdown.png deleted file mode 100644 index fc9cf16b..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/shutdown.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/siduction.png b/my-distro-devuan-32/grub/themes/my-distro/icons/siduction.png deleted file mode 100644 index d16549bc..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/siduction.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/slackware.png b/my-distro-devuan-32/grub/themes/my-distro/icons/slackware.png deleted file mode 100644 index 4c31a3f5..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/slackware.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/solus.png b/my-distro-devuan-32/grub/themes/my-distro/icons/solus.png deleted file mode 100644 index 338718b3..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/solus.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/steamos.png b/my-distro-devuan-32/grub/themes/my-distro/icons/steamos.png deleted file mode 100644 index df28bccc..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/steamos.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/type.png b/my-distro-devuan-32/grub/themes/my-distro/icons/type.png deleted file mode 100644 index 5c48476d..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/type.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/tz.png b/my-distro-devuan-32/grub/themes/my-distro/icons/tz.png deleted file mode 100644 index 220b29b1..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/tz.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/ubuntu.png b/my-distro-devuan-32/grub/themes/my-distro/icons/ubuntu.png deleted file mode 100644 index 352fbe08..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/ubuntu.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/unknown.png b/my-distro-devuan-32/grub/themes/my-distro/icons/unknown.png deleted file mode 100644 index 326b6596..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/unknown.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/unset.png b/my-distro-devuan-32/grub/themes/my-distro/icons/unset.png deleted file mode 100644 index 15e3d3cb..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/unset.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/ventoy.png b/my-distro-devuan-32/grub/themes/my-distro/icons/ventoy.png deleted file mode 100644 index 7abdc6c4..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/ventoy.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/void.png b/my-distro-devuan-32/grub/themes/my-distro/icons/void.png deleted file mode 100644 index 01cc2f3a..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/void.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/windows.png b/my-distro-devuan-32/grub/themes/my-distro/icons/windows.png deleted file mode 100644 index d5c7cc34..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/windows.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/windows11.png b/my-distro-devuan-32/grub/themes/my-distro/icons/windows11.png deleted file mode 100644 index fe97d9f7..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/windows11.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/xero.png b/my-distro-devuan-32/grub/themes/my-distro/icons/xero.png deleted file mode 100644 index 2221c73d..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/xero.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/xerolinux.png b/my-distro-devuan-32/grub/themes/my-distro/icons/xerolinux.png deleted file mode 100644 index 2221c73d..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/xerolinux.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/xubuntu.png b/my-distro-devuan-32/grub/themes/my-distro/icons/xubuntu.png deleted file mode 100644 index f43abc7b..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/xubuntu.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/icons/zorin.png b/my-distro-devuan-32/grub/themes/my-distro/icons/zorin.png deleted file mode 100644 index c1506c44..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/icons/zorin.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/select_c.png b/my-distro-devuan-32/grub/themes/my-distro/select_c.png deleted file mode 100644 index b1f8d580..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/select_c.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/select_e.png b/my-distro-devuan-32/grub/themes/my-distro/select_e.png deleted file mode 100644 index 93323686..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/select_e.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/select_w.png b/my-distro-devuan-32/grub/themes/my-distro/select_w.png deleted file mode 100644 index 28f6424e..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/select_w.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/terminal_box_c.png b/my-distro-devuan-32/grub/themes/my-distro/terminal_box_c.png deleted file mode 100644 index d0dd52a2..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/terminal_box_c.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/terminal_box_e.png b/my-distro-devuan-32/grub/themes/my-distro/terminal_box_e.png deleted file mode 100644 index 394cbe4f..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/terminal_box_e.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/terminal_box_n.png b/my-distro-devuan-32/grub/themes/my-distro/terminal_box_n.png deleted file mode 100644 index 476f8bc6..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/terminal_box_n.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/terminal_box_ne.png b/my-distro-devuan-32/grub/themes/my-distro/terminal_box_ne.png deleted file mode 100644 index 9e26959b..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/terminal_box_ne.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/terminal_box_nw.png b/my-distro-devuan-32/grub/themes/my-distro/terminal_box_nw.png deleted file mode 100644 index 5c3cba87..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/terminal_box_nw.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/terminal_box_s.png b/my-distro-devuan-32/grub/themes/my-distro/terminal_box_s.png deleted file mode 100644 index 85a8901d..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/terminal_box_s.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/terminal_box_se.png b/my-distro-devuan-32/grub/themes/my-distro/terminal_box_se.png deleted file mode 100644 index d8627ee5..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/terminal_box_se.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/terminal_box_sw.png b/my-distro-devuan-32/grub/themes/my-distro/terminal_box_sw.png deleted file mode 100644 index 67c600c8..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/terminal_box_sw.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/terminal_box_w.png b/my-distro-devuan-32/grub/themes/my-distro/terminal_box_w.png deleted file mode 100644 index d066e2db..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/terminal_box_w.png and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/terminus-12.pf2 b/my-distro-devuan-32/grub/themes/my-distro/terminus-12.pf2 deleted file mode 100644 index 60920353..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/terminus-12.pf2 and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/terminus-14.pf2 b/my-distro-devuan-32/grub/themes/my-distro/terminus-14.pf2 deleted file mode 100644 index 8ab8bd10..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/terminus-14.pf2 and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/terminus-16.pf2 b/my-distro-devuan-32/grub/themes/my-distro/terminus-16.pf2 deleted file mode 100644 index 6e6b25d3..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/terminus-16.pf2 and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/terminus-18.pf2 b/my-distro-devuan-32/grub/themes/my-distro/terminus-18.pf2 deleted file mode 100644 index 129cef14..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/terminus-18.pf2 and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/theme.txt b/my-distro-devuan-32/grub/themes/my-distro/theme.txt deleted file mode 100644 index 3f26eea5..00000000 --- a/my-distro-devuan-32/grub/themes/my-distro/theme.txt +++ /dev/null @@ -1,42 +0,0 @@ -# Main options -title-text: "" -desktop-image: "background.png" -desktop-color: "#000000" -terminal-font: "Terminus Regular 14" -terminal-box: "terminal_box_*.png" -terminal-left: "0" -terminal-top: "0" -terminal-width: "100%" -terminal-height: "100%" -terminal-border: "0" - -# Boot menu -+ boot_menu { - left = 15% - top = 40% - width = 60% - height = 65% - item_font = "Ubuntu Regular 20" - item_color = "#cccccc" - selected_item_color = "#ffffff" - icon_width = 36 - icon_height = 36 - item_icon_space = 20 - item_height = 40 - item_padding = 2 - item_spacing = 10 - selected_item_pixmap_style = "select_*.png" -} - - -# Countdown label -# You can change the name of default starting OS here -+ label { - left = 15% - top = 31% - align = "center" - id = "__timeout__" - text = "My-distro will start in %d seconds" - color = "#cccccc" - font = "Ubuntu Regular 17" -} diff --git a/my-distro-devuan-32/grub/themes/my-distro/ubuntu_regular_17.pf2 b/my-distro-devuan-32/grub/themes/my-distro/ubuntu_regular_17.pf2 deleted file mode 100644 index 9405954e..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/ubuntu_regular_17.pf2 and /dev/null differ diff --git a/my-distro-devuan-32/grub/themes/my-distro/ubuntu_regular_20.pf2 b/my-distro-devuan-32/grub/themes/my-distro/ubuntu_regular_20.pf2 deleted file mode 100644 index 3d903bae..00000000 Binary files a/my-distro-devuan-32/grub/themes/my-distro/ubuntu_regular_20.pf2 and /dev/null differ diff --git a/my-distro-devuan-64/build.sh b/my-distro-devuan-64/build.sh index 94741dbd..6434ea78 100755 --- a/my-distro-devuan-64/build.sh +++ b/my-distro-devuan-64/build.sh @@ -258,9 +258,10 @@ cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf. cp $build/applications/* $build/build/config/includes.chroot/usr/share/applications cp $build/hooks/devuan/live/* $build/build/config/includes.chroot/usr/lib/live/config cp $build/hooks/devuan/normal/* $build/build/config/hooks/normal -cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/calamares/devuan/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/deb-installer/devuan/scripts/* $build/build/config/includes.installer/usr/lib/finish-install.d cp $build/deb-installer/devuan/preseed/* $build/build/config/includes.installer @@ -272,7 +273,7 @@ cp -r $build/calamares/devuan/calamares/* $build/build/config/includes.chroot/et 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 -cp -r $build/grub/themes/my-distro $build/build/config/includes.chroot/boot/grub/themes +cp -r $build/grub/devuan/themes/* $build/build/config/includes.chroot/boot/grub/themes cp -r $build/deb-installer/devuan/graphics $build/build/config/includes.installer/usr/share cp -r $build/deb-installer/devuan/themes $build/build/config/includes.installer/usr/share #cp -r $build/packages/* $build/build/config/packages.chroot diff --git a/my-distro-devuan-64/grub b/my-distro-devuan-64/grub new file mode 120000 index 00000000..c807ca0d --- /dev/null +++ b/my-distro-devuan-64/grub @@ -0,0 +1 @@ +../grub \ No newline at end of file diff --git a/my-distro-devuan-64/grub/grub b/my-distro-devuan-64/grub/grub deleted file mode 100755 index b3636885..00000000 --- a/my-distro-devuan-64/grub/grub +++ /dev/null @@ -1,35 +0,0 @@ -# If you change this file, run 'update-grub' afterwards to update -# /boot/grub/grub.cfg. -# For full documentation of the options in this file, see: -# info -f grub -n 'Simple configuration' - -GRUB_DEFAULT=0 -GRUB_TIMEOUT=5 -GRUB_DISTRIBUTOR="My-distro" -GRUB_CMDLINE_LINUX_DEFAULT="quiet splash" -GRUB_CMDLINE_LINUX="" - -# Uncomment to enable BadRAM filtering, modify to suit your needs -# This works with Linux (no patch required) and with any kernel that obtains -# the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...) -#GRUB_BADRAM="0x01234567,0xfefefefe,0x89abcdef,0xefefefef" - -# Uncomment to disable graphical terminal (grub-pc only) -#GRUB_TERMINAL=console - -# The resolution used on graphical terminal -# note that you can use only modes which your graphic card supports via VBE -# you can see them in real GRUB with the command `vbeinfo' -GRUB_GFXMODE=1440x900 - -# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux -#GRUB_DISABLE_LINUX_UUID=true - -# Uncomment to disable generation of recovery mode menu entries -#GRUB_DISABLE_RECOVERY="true" - -# Uncomment to get a beep at grub start -#GRUB_INIT_TUNE="480 440 1" - -#Grub theme -GRUB_THEME="/boot/grub/themes/my-distro/theme.txt" diff --git a/my-distro-devuan-64/grub/themes/my-distro/background.png b/my-distro-devuan-64/grub/themes/my-distro/background.png deleted file mode 100644 index 59b84691..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/background.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/4MLinux.png b/my-distro-devuan-64/grub/themes/my-distro/icons/4MLinux.png deleted file mode 100644 index 1c6fe5e2..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/4MLinux.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/AlpineLinux.png b/my-distro-devuan-64/grub/themes/my-distro/icons/AlpineLinux.png deleted file mode 100644 index 6212a1fa..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/AlpineLinux.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/Manjaro.i686.png b/my-distro-devuan-64/grub/themes/my-distro/icons/Manjaro.i686.png deleted file mode 100644 index 611a6fbc..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/Manjaro.i686.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/Manjaro.x86_64.png b/my-distro-devuan-64/grub/themes/my-distro/icons/Manjaro.x86_64.png deleted file mode 100644 index 611a6fbc..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/Manjaro.x86_64.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/SystemRescueCD.png b/my-distro-devuan-64/grub/themes/my-distro/icons/SystemRescueCD.png deleted file mode 100644 index 7c41182f..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/SystemRescueCD.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/android.png b/my-distro-devuan-64/grub/themes/my-distro/icons/android.png deleted file mode 100644 index dad066f5..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/android.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/anonymous.png b/my-distro-devuan-64/grub/themes/my-distro/icons/anonymous.png deleted file mode 100644 index 7d165b67..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/anonymous.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/antergos.png b/my-distro-devuan-64/grub/themes/my-distro/icons/antergos.png deleted file mode 100644 index 32e3a3a3..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/antergos.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/arch.png b/my-distro-devuan-64/grub/themes/my-distro/icons/arch.png deleted file mode 100644 index f6cd8704..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/arch.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/archlinux.png b/my-distro-devuan-64/grub/themes/my-distro/icons/archlinux.png deleted file mode 100644 index f6cd8704..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/archlinux.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/arcolinux.png b/my-distro-devuan-64/grub/themes/my-distro/icons/arcolinux.png deleted file mode 100644 index c5e5e5ea..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/arcolinux.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/artix.png b/my-distro-devuan-64/grub/themes/my-distro/icons/artix.png deleted file mode 100644 index 0cbeb11c..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/artix.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/bedrock.png b/my-distro-devuan-64/grub/themes/my-distro/icons/bedrock.png deleted file mode 100644 index 58ff48a8..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/bedrock.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/cancel.png b/my-distro-devuan-64/grub/themes/my-distro/icons/cancel.png deleted file mode 100644 index fca2ac9d..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/cancel.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/centos.png b/my-distro-devuan-64/grub/themes/my-distro/icons/centos.png deleted file mode 100644 index 23fe2fa5..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/centos.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/chakra.png b/my-distro-devuan-64/grub/themes/my-distro/icons/chakra.png deleted file mode 100644 index 6f63a959..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/chakra.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/debian.png b/my-distro-devuan-64/grub/themes/my-distro/icons/debian.png deleted file mode 100644 index 20bea8c2..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/debian.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/deepin.png b/my-distro-devuan-64/grub/themes/my-distro/icons/deepin.png deleted file mode 100644 index 61c92fb4..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/deepin.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/devuan.png b/my-distro-devuan-64/grub/themes/my-distro/icons/devuan.png deleted file mode 100644 index ff654016..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/devuan.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/driver.png b/my-distro-devuan-64/grub/themes/my-distro/icons/driver.png deleted file mode 100644 index 1621ee7f..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/driver.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/edit.png b/my-distro-devuan-64/grub/themes/my-distro/icons/edit.png deleted file mode 100644 index 6a43bd99..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/edit.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/efi.png b/my-distro-devuan-64/grub/themes/my-distro/icons/efi.png deleted file mode 100644 index 4ecf3b98..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/efi.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/elementary.png b/my-distro-devuan-64/grub/themes/my-distro/icons/elementary.png deleted file mode 100644 index 2840354c..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/elementary.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/endeavouros.png b/my-distro-devuan-64/grub/themes/my-distro/icons/endeavouros.png deleted file mode 100644 index 6b1e530d..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/endeavouros.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/fedora.png b/my-distro-devuan-64/grub/themes/my-distro/icons/fedora.png deleted file mode 100644 index 926b56d1..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/fedora.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/find.efi.png b/my-distro-devuan-64/grub/themes/my-distro/icons/find.efi.png deleted file mode 100644 index 0e32321a..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/find.efi.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/find.none.png b/my-distro-devuan-64/grub/themes/my-distro/icons/find.none.png deleted file mode 100644 index 87d4d0ec..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/find.none.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/freebsd.png b/my-distro-devuan-64/grub/themes/my-distro/icons/freebsd.png deleted file mode 100644 index fb9408cf..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/freebsd.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/garuda.png b/my-distro-devuan-64/grub/themes/my-distro/icons/garuda.png deleted file mode 100644 index f699718a..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/garuda.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/gentoo.png b/my-distro-devuan-64/grub/themes/my-distro/icons/gentoo.png deleted file mode 100644 index bc0ed705..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/gentoo.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/gnu-linux.png b/my-distro-devuan-64/grub/themes/my-distro/icons/gnu-linux.png deleted file mode 100644 index 326b6596..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/gnu-linux.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/haiku.png b/my-distro-devuan-64/grub/themes/my-distro/icons/haiku.png deleted file mode 100644 index ce7f8182..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/haiku.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/help.png b/my-distro-devuan-64/grub/themes/my-distro/icons/help.png deleted file mode 100644 index d8b5a173..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/help.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/kali.png b/my-distro-devuan-64/grub/themes/my-distro/icons/kali.png deleted file mode 100644 index 900dc82e..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/kali.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/kaos.png b/my-distro-devuan-64/grub/themes/my-distro/icons/kaos.png deleted file mode 100644 index 9fd4e891..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/kaos.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/kbd.png b/my-distro-devuan-64/grub/themes/my-distro/icons/kbd.png deleted file mode 100644 index 6ace3ace..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/kbd.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/korora.png b/my-distro-devuan-64/grub/themes/my-distro/icons/korora.png deleted file mode 100644 index 456e8764..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/korora.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/kubuntu.png b/my-distro-devuan-64/grub/themes/my-distro/icons/kubuntu.png deleted file mode 100644 index 7a79ff32..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/kubuntu.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/lang.png b/my-distro-devuan-64/grub/themes/my-distro/icons/lang.png deleted file mode 100644 index 3c9c1d79..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/lang.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/lfs.png b/my-distro-devuan-64/grub/themes/my-distro/icons/lfs.png deleted file mode 100644 index 326b6596..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/lfs.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/linux.png b/my-distro-devuan-64/grub/themes/my-distro/icons/linux.png deleted file mode 100644 index 326b6596..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/linux.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/linuxmint.png b/my-distro-devuan-64/grub/themes/my-distro/icons/linuxmint.png deleted file mode 100644 index 7d9da816..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/linuxmint.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/lubuntu.png b/my-distro-devuan-64/grub/themes/my-distro/icons/lubuntu.png deleted file mode 100644 index 057c8e25..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/lubuntu.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/macosx.png b/my-distro-devuan-64/grub/themes/my-distro/icons/macosx.png deleted file mode 100644 index ea03e779..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/macosx.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/mageia.png b/my-distro-devuan-64/grub/themes/my-distro/icons/mageia.png deleted file mode 100644 index 79afa761..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/mageia.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/manjaro.png b/my-distro-devuan-64/grub/themes/my-distro/icons/manjaro.png deleted file mode 100644 index 611a6fbc..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/manjaro.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/mate.png b/my-distro-devuan-64/grub/themes/my-distro/icons/mate.png deleted file mode 100644 index b2fc22aa..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/mate.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/memtest.png b/my-distro-devuan-64/grub/themes/my-distro/icons/memtest.png deleted file mode 100644 index 1621ee7f..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/memtest.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/mx-linux.png b/my-distro-devuan-64/grub/themes/my-distro/icons/mx-linux.png deleted file mode 100644 index 49f11336..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/mx-linux.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/neon.png b/my-distro-devuan-64/grub/themes/my-distro/icons/neon.png deleted file mode 100644 index e41906e8..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/neon.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/opensuse.png b/my-distro-devuan-64/grub/themes/my-distro/icons/opensuse.png deleted file mode 100644 index d844fd5a..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/opensuse.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/parrot.png b/my-distro-devuan-64/grub/themes/my-distro/icons/parrot.png deleted file mode 100644 index 3333de91..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/parrot.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/pop-os.png b/my-distro-devuan-64/grub/themes/my-distro/icons/pop-os.png deleted file mode 100644 index 014d9f32..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/pop-os.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/pop.png b/my-distro-devuan-64/grub/themes/my-distro/icons/pop.png deleted file mode 100644 index 014d9f32..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/pop.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/recovery.png b/my-distro-devuan-64/grub/themes/my-distro/icons/recovery.png deleted file mode 100644 index 7b69b142..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/recovery.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/regolith.png b/my-distro-devuan-64/grub/themes/my-distro/icons/regolith.png deleted file mode 100644 index 5ece07ba..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/regolith.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/restart.png b/my-distro-devuan-64/grub/themes/my-distro/icons/restart.png deleted file mode 100644 index 97153021..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/restart.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/rocky.png b/my-distro-devuan-64/grub/themes/my-distro/icons/rocky.png deleted file mode 100644 index be144f6d..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/rocky.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/shutdown.png b/my-distro-devuan-64/grub/themes/my-distro/icons/shutdown.png deleted file mode 100644 index fc9cf16b..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/shutdown.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/siduction.png b/my-distro-devuan-64/grub/themes/my-distro/icons/siduction.png deleted file mode 100644 index d16549bc..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/siduction.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/slackware.png b/my-distro-devuan-64/grub/themes/my-distro/icons/slackware.png deleted file mode 100644 index 4c31a3f5..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/slackware.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/solus.png b/my-distro-devuan-64/grub/themes/my-distro/icons/solus.png deleted file mode 100644 index 338718b3..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/solus.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/steamos.png b/my-distro-devuan-64/grub/themes/my-distro/icons/steamos.png deleted file mode 100644 index df28bccc..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/steamos.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/type.png b/my-distro-devuan-64/grub/themes/my-distro/icons/type.png deleted file mode 100644 index 5c48476d..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/type.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/tz.png b/my-distro-devuan-64/grub/themes/my-distro/icons/tz.png deleted file mode 100644 index 220b29b1..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/tz.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/ubuntu.png b/my-distro-devuan-64/grub/themes/my-distro/icons/ubuntu.png deleted file mode 100644 index 352fbe08..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/ubuntu.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/unknown.png b/my-distro-devuan-64/grub/themes/my-distro/icons/unknown.png deleted file mode 100644 index 326b6596..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/unknown.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/unset.png b/my-distro-devuan-64/grub/themes/my-distro/icons/unset.png deleted file mode 100644 index 15e3d3cb..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/unset.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/ventoy.png b/my-distro-devuan-64/grub/themes/my-distro/icons/ventoy.png deleted file mode 100644 index 7abdc6c4..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/ventoy.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/void.png b/my-distro-devuan-64/grub/themes/my-distro/icons/void.png deleted file mode 100644 index 01cc2f3a..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/void.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/windows.png b/my-distro-devuan-64/grub/themes/my-distro/icons/windows.png deleted file mode 100644 index d5c7cc34..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/windows.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/windows11.png b/my-distro-devuan-64/grub/themes/my-distro/icons/windows11.png deleted file mode 100644 index fe97d9f7..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/windows11.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/xero.png b/my-distro-devuan-64/grub/themes/my-distro/icons/xero.png deleted file mode 100644 index 2221c73d..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/xero.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/xerolinux.png b/my-distro-devuan-64/grub/themes/my-distro/icons/xerolinux.png deleted file mode 100644 index 2221c73d..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/xerolinux.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/xubuntu.png b/my-distro-devuan-64/grub/themes/my-distro/icons/xubuntu.png deleted file mode 100644 index f43abc7b..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/xubuntu.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/icons/zorin.png b/my-distro-devuan-64/grub/themes/my-distro/icons/zorin.png deleted file mode 100644 index c1506c44..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/icons/zorin.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/select_c.png b/my-distro-devuan-64/grub/themes/my-distro/select_c.png deleted file mode 100644 index b1f8d580..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/select_c.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/select_e.png b/my-distro-devuan-64/grub/themes/my-distro/select_e.png deleted file mode 100644 index 93323686..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/select_e.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/select_w.png b/my-distro-devuan-64/grub/themes/my-distro/select_w.png deleted file mode 100644 index 28f6424e..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/select_w.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/terminal_box_c.png b/my-distro-devuan-64/grub/themes/my-distro/terminal_box_c.png deleted file mode 100644 index d0dd52a2..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/terminal_box_c.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/terminal_box_e.png b/my-distro-devuan-64/grub/themes/my-distro/terminal_box_e.png deleted file mode 100644 index 394cbe4f..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/terminal_box_e.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/terminal_box_n.png b/my-distro-devuan-64/grub/themes/my-distro/terminal_box_n.png deleted file mode 100644 index 476f8bc6..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/terminal_box_n.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/terminal_box_ne.png b/my-distro-devuan-64/grub/themes/my-distro/terminal_box_ne.png deleted file mode 100644 index 9e26959b..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/terminal_box_ne.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/terminal_box_nw.png b/my-distro-devuan-64/grub/themes/my-distro/terminal_box_nw.png deleted file mode 100644 index 5c3cba87..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/terminal_box_nw.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/terminal_box_s.png b/my-distro-devuan-64/grub/themes/my-distro/terminal_box_s.png deleted file mode 100644 index 85a8901d..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/terminal_box_s.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/terminal_box_se.png b/my-distro-devuan-64/grub/themes/my-distro/terminal_box_se.png deleted file mode 100644 index d8627ee5..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/terminal_box_se.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/terminal_box_sw.png b/my-distro-devuan-64/grub/themes/my-distro/terminal_box_sw.png deleted file mode 100644 index 67c600c8..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/terminal_box_sw.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/terminal_box_w.png b/my-distro-devuan-64/grub/themes/my-distro/terminal_box_w.png deleted file mode 100644 index d066e2db..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/terminal_box_w.png and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/terminus-12.pf2 b/my-distro-devuan-64/grub/themes/my-distro/terminus-12.pf2 deleted file mode 100644 index 60920353..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/terminus-12.pf2 and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/terminus-14.pf2 b/my-distro-devuan-64/grub/themes/my-distro/terminus-14.pf2 deleted file mode 100644 index 8ab8bd10..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/terminus-14.pf2 and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/terminus-16.pf2 b/my-distro-devuan-64/grub/themes/my-distro/terminus-16.pf2 deleted file mode 100644 index 6e6b25d3..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/terminus-16.pf2 and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/terminus-18.pf2 b/my-distro-devuan-64/grub/themes/my-distro/terminus-18.pf2 deleted file mode 100644 index 129cef14..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/terminus-18.pf2 and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/theme.txt b/my-distro-devuan-64/grub/themes/my-distro/theme.txt deleted file mode 100644 index 3f26eea5..00000000 --- a/my-distro-devuan-64/grub/themes/my-distro/theme.txt +++ /dev/null @@ -1,42 +0,0 @@ -# Main options -title-text: "" -desktop-image: "background.png" -desktop-color: "#000000" -terminal-font: "Terminus Regular 14" -terminal-box: "terminal_box_*.png" -terminal-left: "0" -terminal-top: "0" -terminal-width: "100%" -terminal-height: "100%" -terminal-border: "0" - -# Boot menu -+ boot_menu { - left = 15% - top = 40% - width = 60% - height = 65% - item_font = "Ubuntu Regular 20" - item_color = "#cccccc" - selected_item_color = "#ffffff" - icon_width = 36 - icon_height = 36 - item_icon_space = 20 - item_height = 40 - item_padding = 2 - item_spacing = 10 - selected_item_pixmap_style = "select_*.png" -} - - -# Countdown label -# You can change the name of default starting OS here -+ label { - left = 15% - top = 31% - align = "center" - id = "__timeout__" - text = "My-distro will start in %d seconds" - color = "#cccccc" - font = "Ubuntu Regular 17" -} diff --git a/my-distro-devuan-64/grub/themes/my-distro/ubuntu_regular_17.pf2 b/my-distro-devuan-64/grub/themes/my-distro/ubuntu_regular_17.pf2 deleted file mode 100644 index 9405954e..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/ubuntu_regular_17.pf2 and /dev/null differ diff --git a/my-distro-devuan-64/grub/themes/my-distro/ubuntu_regular_20.pf2 b/my-distro-devuan-64/grub/themes/my-distro/ubuntu_regular_20.pf2 deleted file mode 100644 index 3d903bae..00000000 Binary files a/my-distro-devuan-64/grub/themes/my-distro/ubuntu_regular_20.pf2 and /dev/null differ