diff --git a/build-all.sh b/build-all.sh index 81d83f1e..fa88f5c2 100755 --- a/build-all.sh +++ b/build-all.sh @@ -20,4 +20,3 @@ git pull --ff ./my-distro-devuan-32/BldHelper.sh ./my-distro-devuan-32-pae/BldHelper.sh ./my-distro-devuan-64/BldHelper.sh -./my-distro-ubuntu-64/BldHelper.sh diff --git a/my-distro-devuan-32-pae/bootloaders/boot/grub/config.cfg b/my-distro-devuan-32-pae/bootloaders/boot/grub/config.cfg index 78b032f0..1061be0f 100644 --- a/my-distro-devuan-32-pae/bootloaders/boot/grub/config.cfg +++ b/my-distro-devuan-32-pae/bootloaders/boot/grub/config.cfg @@ -1,10 +1,24 @@ set default=0 -loadfont $prefix/dejavu-bold-16.pf2 -loadfont $prefix/dejavu-bold-14.pf2 -loadfont $prefix/unicode.pf2 -set gfxmode=auto -insmod all_video +if [ x$feature_default_font_path = xy ] ; then + font=unicode +else + font=$prefix/unicode.pf2 +fi + +# Copied from the netinst image +if loadfont $font ; then + set gfxmode=800x600 + set gfxpayload=keep + insmod efi_gop + insmod efi_uga + insmod video_bochs + insmod video_cirrus +else + set gfxmode=auto + insmod all_video +fi + insmod gfxterm insmod png @@ -12,6 +26,5 @@ source /boot/grub/theme.cfg terminal_output gfxterm -# Uncomment so grub beeps during boot insmod play play 960 440 1 0 4 440 1 diff --git a/my-distro-devuan-32-pae/bootloaders/boot/grub/dejavu-bold-14.pf2 b/my-distro-devuan-32-pae/bootloaders/boot/grub/dejavu-bold-14.pf2 deleted file mode 100644 index 9b093b20..00000000 Binary files a/my-distro-devuan-32-pae/bootloaders/boot/grub/dejavu-bold-14.pf2 and /dev/null differ diff --git a/my-distro-devuan-32-pae/bootloaders/boot/grub/dejavu-bold-16.pf2 b/my-distro-devuan-32-pae/bootloaders/boot/grub/dejavu-bold-16.pf2 deleted file mode 100644 index 11e7f7ab..00000000 Binary files a/my-distro-devuan-32-pae/bootloaders/boot/grub/dejavu-bold-16.pf2 and /dev/null differ diff --git a/my-distro-devuan-32-pae/bootloaders/boot/grub/font.pf2 b/my-distro-devuan-32-pae/bootloaders/boot/grub/font.pf2 deleted file mode 100644 index 59e8ffa6..00000000 Binary files a/my-distro-devuan-32-pae/bootloaders/boot/grub/font.pf2 and /dev/null differ diff --git a/my-distro-devuan-32-pae/bootloaders/boot/grub/grub.cfg b/my-distro-devuan-32-pae/bootloaders/boot/grub/grub.cfg index 37dcd573..51999cfb 100644 --- a/my-distro-devuan-32-pae/bootloaders/boot/grub/grub.cfg +++ b/my-distro-devuan-32-pae/bootloaders/boot/grub/grub.cfg @@ -1,41 +1,57 @@ source /boot/grub/config.cfg -menuentry "My-distro Live" { - linux /live/vmlinuz boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "My-distro Live (fail-safe mode)" { - linux /live/initrd.img boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal +# Live boot +menuentry "My-distro Live)" --hotkey=l { + linux /live/vmlinuz boot=live components quiet splash findiso=${iso_path} initrd /live/initrd.img } -submenu "My-distro Live with Localisation Support" { -menuentry "Portuguese (pt)" { - linux /live/vmlinuz boot=live components locales=pt_PT.UTF-8 quiet splash keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "Portuguese (Brazil) (pt_BR)" { - linux /live/vmlinuz boot=live components locales=pt_BR.UTF-8 quiet splash keyboard-layouts=br username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "English (en)" { - linux /live/vmlinuz boot=live components locales=en_US.UTF-8 quiet splash keyboard-layouts=en username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "French (fr)" { - linux /live/vmlinuz boot=live components locales=fr_FR.UTF-8 quiet splash keyboard-layouts=fr username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "German (de)" { - linux /live/vmlinuz boot=live components locales=de_DE.UTF-8 quiet splash keyboard-layouts=de username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "Italian (it)" { - linux /live/vmlinuz boot=live components locales=it_IT.UTF-8 quiet splash keyboard-layouts=it username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "Spanish (es)" { - linux /live/vmlinuz boot=live components locales=es_ES.UTF-8 quiet splash keyboard-layouts=es username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} +menuentry "My-distro Live ( fail-safe mode)" { + linux /live/vmlinuz boot=live components memtest noapic noapm nodma nomce nolapic nosmp nosplash vga=788 + initrd /live/initrd.img } +# You can add more entries like this +# menuentry "Alternate live boot" { +# linux /live/vmlinuz boot=live components quiet splash findiso=${iso_path} custom options here +# initrd /live/initrd.img +# } +# menuentry "Alternate graphical installer" { +# linux /install/gtk/vmlinuz vga=788 --- quiet custom options here +# initrd /install/gtk/initrd.gz +# } +# menuentry "Alternate textual installer" { +# linux /install/vmlinuz vga=normal --- quiet custom options here +# initrd /install/initrd.gz +# } + +# Installer (if any) +if true; then + +source /boot/grub/install_start.cfg + +submenu 'Advanced install options ...' --hotkey=a { + + source /boot/grub/theme.cfg + + source /boot/grub/install.cfg + +} +fi + +submenu 'Utilities...' --hotkey=u { + + source /boot/grub/theme.cfg + + # Memtest (if any) + if false; then + source /boot/grub/memtest.cfg + fi + + # Firmware setup (UEFI) + if [ "${grub_platform}" = "efi" ]; then + menuentry "UEFI Firmware Settings" { + fwsetup + } + fi + +} diff --git a/my-distro-devuan-32-pae/bootloaders/boot/grub/install.cfg b/my-distro-devuan-32-pae/bootloaders/boot/grub/install.cfg new file mode 100644 index 00000000..6e6a5171 --- /dev/null +++ b/my-distro-devuan-32-pae/bootloaders/boot/grub/install.cfg @@ -0,0 +1,124 @@ +submenu 'Graphical installer ...' --hotkey=g { + + source /boot/grub/theme.cfg + + menuentry 'Install' --hotkey=i { + linux /install/gtk/vmlinuz vga=788 --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Expert install' --hotkey=x { + linux /install/gtk/vmlinuz priority=low vga=788 + initrd /install/gtk/initrd.gz + } + + menuentry 'Automated install' --hotkey=a { + linux /install/gtk/vmlinuz auto=true priority=critical vga=788 --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Rescue mode' --hotkey=r { + linux /install/gtk/vmlinuz rescue/enable=true vga=788 --- quiet + initrd /install/gtk/initrd.gz + } +} + +submenu 'Text installer ...' --hotkey=t { + + source /boot/grub/theme.cfg + + menuentry 'Install' --hotkey=i { + linux /install/vmlinuz vga=788 --- quiet + initrd /install/initrd.gz + } + + menuentry 'Expert install' --hotkey=x { + linux /install/vmlinuz priority=low vga=788 + initrd /install/initrd.gz + } + + menuentry 'Automated install' --hotkey=a { + linux /install/vmlinuz auto=true priority=critical vga=788 --- quiet + initrd /install/initrd.gz + } + + menuentry 'Rescue mode' --hotkey=r { + linux /install/vmlinuz rescue/enable=true vga=788 --- quiet + initrd /install/initrd.gz + } +} + +submenu 'Graphical installer with dark theme ...' --hotkey=d { + + source /boot/grub/theme.cfg + + menuentry 'Install' --hotkey=i { + linux /install/gtk/vmlinuz vga=788 theme=dark --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Expert install' --hotkey=x { + linux /install/gtk/vmlinuz priority=low vga=788 theme=dark + initrd /install/gtk/initrd.gz + } + + menuentry 'Automated install' --hotkey=a { + linux /install/gtk/vmlinuz auto=true priority=critical vga=788 theme=dark --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Rescue mode' --hotkey=r { + linux /install/gtk/vmlinuz rescue/enable=true vga=788 theme=dark --- quiet + initrd /install/gtk/initrd.gz + } +} + +submenu 'Text installer with dark theme ...' --hotkey=k { + + source /boot/grub/theme.cfg + + menuentry 'Install' --hotkey=i { + linux /install/vmlinuz vga=788 theme=dark --- quiet + initrd /install/initrd.gz + } + + menuentry 'Expert install' --hotkey=x { + linux /install/vmlinuz priority=low vga=788 theme=dark + initrd /install/initrd.gz + } + + menuentry 'Automated install' --hotkey=a { + linux /install/vmlinuz auto=true priority=critical vga=788 theme=dark --- quiet + initrd /install/initrd.gz + } + + menuentry 'Rescue mode' --hotkey=r { + linux /install/vmlinuz rescue/enable=true vga=788 theme=dark --- quiet + initrd /install/initrd.gz + } +} + +submenu 'Installer with speech synthesis ...' --hotkey=s { + + source /boot/grub/theme.cfg + + menuentry 'Install' --hotkey=i { + linux /install/gtk/vmlinuz speakup.synth=soft vga=788 --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Expert install' --hotkey=x { + linux /install/gtk/vmlinuz speakup.synth=soft priority=low vga=788 + initrd /install/gtk/initrd.gz + } + + menuentry 'Automated install' --hotkey=a { + linux /install/gtk/vmlinuz speakup.synth=soft auto=true priority=critical vga=788 --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Rescue mode' --hotkey=r { + linux /install/gtk/vmlinuz speakup.synth=soft rescue/enable=true vga=788 --- quiet + initrd /install/gtk/initrd.gz + } +} diff --git a/my-distro-devuan-32-pae/bootloaders/boot/grub/install_start.cfg b/my-distro-devuan-32-pae/bootloaders/boot/grub/install_start.cfg new file mode 100644 index 00000000..24542254 --- /dev/null +++ b/my-distro-devuan-32-pae/bootloaders/boot/grub/install_start.cfg @@ -0,0 +1,9 @@ +menuentry 'Start installer' --hotkey=i { + linux /install/gtk/vmlinuz vga=788 --- quiet + initrd /install/gtk/initrd.gz +} + +menuentry 'Start installer with speech synthesis' --hotkey=s { + linux /install/gtk/vmlinuz speakup.synth=soft vga=788 --- quiet + initrd /install/gtk/initrd.gz +} diff --git a/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/background.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/background.png index 59b84691..afbe78d0 100644 Binary files a/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/background.png and b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/background.png differ diff --git a/my-distro-devuan-32-pae/bootloaders/boot/grub/loopback.cfg b/my-distro-devuan-32-pae/bootloaders/boot/grub/loopback.cfg index b8e3b214..e94c44d2 100644 --- a/my-distro-devuan-32-pae/bootloaders/boot/grub/loopback.cfg +++ b/my-distro-devuan-32-pae/bootloaders/boot/grub/loopback.cfg @@ -1 +1 @@ -source /boot/grub/grub.cfg \ No newline at end of file +source /boot/grub/grub.cfg diff --git a/my-distro-devuan-32-pae/bootloaders/boot/grub/unicode.pf2 b/my-distro-devuan-32-pae/bootloaders/boot/grub/unicode.pf2 new file mode 100644 index 00000000..290ddc05 Binary files /dev/null and b/my-distro-devuan-32-pae/bootloaders/boot/grub/unicode.pf2 differ diff --git a/my-distro-devuan-32-pae/bootloaders/isolinux/chain.c32 b/my-distro-devuan-32-pae/bootloaders/isolinux/chain.c32 deleted file mode 100644 index a9d6e0ea..00000000 Binary files a/my-distro-devuan-32-pae/bootloaders/isolinux/chain.c32 and /dev/null differ diff --git a/my-distro-devuan-32-pae/bootloaders/isolinux/hdt.c32 b/my-distro-devuan-32-pae/bootloaders/isolinux/hdt.c32 new file mode 100644 index 00000000..d67d918c Binary files /dev/null and b/my-distro-devuan-32-pae/bootloaders/isolinux/hdt.c32 differ diff --git a/my-distro-devuan-32-pae/bootloaders/isolinux/install.cfg b/my-distro-devuan-32-pae/bootloaders/isolinux/install.cfg new file mode 100644 index 00000000..7ad06704 --- /dev/null +++ b/my-distro-devuan-32-pae/bootloaders/isolinux/install.cfg @@ -0,0 +1,185 @@ +label installstart + menu label Start ^installer + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append vga=788 --- quiet + +label installstartspeech + menu label Start installer with ^speech synthesis + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append speakup.synth=soft vga=788 --- quiet + +menu begin install + menu label ^Advanced install options + menu title Advanced install options + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + menu begin graphicalinstall + menu label ^Graphical installer + menu title Graphical installer + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + label installgui + menu label ^Install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append vga=788 --- quiet + + label expertgui + menu label E^xpert install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append priority=low vga=788 + + label autogui + menu label ^Automated install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append auto=true priority=critical vga=788 --- quiet + + label rescuegui + menu label ^Rescue mode + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append rescue/enable=true vga=788 --- quiet + menu end + + menu begin textinstall + menu label ^Text installer + menu title Text installer + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + label install + menu label ^Install + linux /install/vmlinuz + initrd /install/initrd.gz + append vga=788 --- quiet + + label expert + menu label E^xpert install + linux /install/vmlinuz + initrd /install/initrd.gz + append priority=low vga=788 + + label auto + menu label ^Automated install + linux /install/vmlinuz + initrd /install/initrd.gz + append auto=true priority=critical vga=788 --- quiet + + label rescue + menu label ^Rescue mode + linux /install/vmlinuz + initrd /install/initrd.gz + append rescue/enable=true vga=788 --- quiet + menu end + + menu begin graphicalinstalldark + menu label Graphical installer with ^dark theme + menu title Graphical installer with dark theme + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + label darkinstallgui + menu label ^Install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append vga=788 theme=dark --- quiet + + label darkexpertgui + menu label E^xpert install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append priority=low vga=788 theme=dark + + label darkautogui + menu label ^Automated install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append auto=true priority=critical vga=788 theme=dark --- quiet + + label darkrescuegui + menu label ^Rescue mode + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append rescue/enable=true vga=788 theme=dark --- quiet + menu end + + menu begin textinstalldark + menu label Text installer with dar^k theme + menu title Text installer with dark theme + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + label darkinstall + menu label ^Install + linux /install/vmlinuz + initrd /install/initrd.gz + append vga=788 theme=dark --- quiet + + label darkexpert + menu label E^xpert install + linux /install/vmlinuz + initrd /install/initrd.gz + append priority=low vga=788 theme=dark + + label darkauto + menu label ^Automated install + linux /install/vmlinuz + initrd /install/initrd.gz + append auto=true priority=critical vga=788 theme=dark --- quiet + + label darkrescue + menu label ^Rescue mode + linux /install/vmlinuz + initrd /install/initrd.gz + append rescue/enable=true vga=788 theme=dark --- quiet + menu end + + menu begin speechinstall + menu label Installer with ^speech synthesis + menu title Installer with speech synthesis + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + label installspeechsynth + menu label ^Install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append speakup.synth=soft vga=788 --- quiet + + label expertguispeech + menu label E^xpert install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append speakup.synth=soft priority=low vga=788 + + label autoguispeech + menu label ^Automated install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append speakup.synth=soft auto=true priority=critical vga=788 --- quiet + + label rescueguispeech + menu label ^Rescue mode + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append speakup.synth=soft rescue/enable=true vga=788 --- quiet + menu end +menu end diff --git a/my-distro-devuan-32-pae/bootloaders/isolinux/isolinux.cfg b/my-distro-devuan-32-pae/bootloaders/isolinux/isolinux.cfg index e5d0290d..a3e3eabc 100644 --- a/my-distro-devuan-32-pae/bootloaders/isolinux/isolinux.cfg +++ b/my-distro-devuan-32-pae/bootloaders/isolinux/isolinux.cfg @@ -1,6 +1,3 @@ -# D-I config version 2.0 -# search path for the c32 support libraries (libcom32, libutil etc.) -path include menu.cfg default vesamenu.c32 prompt 0 diff --git a/my-distro-devuan-32-pae/bootloaders/isolinux/ldlinux.c32 b/my-distro-devuan-32-pae/bootloaders/isolinux/ldlinux.c32 new file mode 100644 index 00000000..e94389bb Binary files /dev/null and b/my-distro-devuan-32-pae/bootloaders/isolinux/ldlinux.c32 differ diff --git a/my-distro-devuan-32-pae/bootloaders/isolinux/libcom32.c32 b/my-distro-devuan-32-pae/bootloaders/isolinux/libcom32.c32 new file mode 100644 index 00000000..c4265b94 Binary files /dev/null and b/my-distro-devuan-32-pae/bootloaders/isolinux/libcom32.c32 differ diff --git a/my-distro-devuan-32-pae/bootloaders/isolinux/libgpl.c32 b/my-distro-devuan-32-pae/bootloaders/isolinux/libgpl.c32 new file mode 100644 index 00000000..11f43f18 Binary files /dev/null and b/my-distro-devuan-32-pae/bootloaders/isolinux/libgpl.c32 differ diff --git a/my-distro-devuan-32-pae/bootloaders/isolinux/libmenu.c32 b/my-distro-devuan-32-pae/bootloaders/isolinux/libmenu.c32 new file mode 100644 index 00000000..b3d69860 Binary files /dev/null and b/my-distro-devuan-32-pae/bootloaders/isolinux/libmenu.c32 differ diff --git a/my-distro-devuan-32-pae/bootloaders/isolinux/libutil.c32 b/my-distro-devuan-32-pae/bootloaders/isolinux/libutil.c32 new file mode 100644 index 00000000..6fc1da7e Binary files /dev/null and b/my-distro-devuan-32-pae/bootloaders/isolinux/libutil.c32 differ diff --git a/my-distro-devuan-32-pae/bootloaders/isolinux/live.cfg b/my-distro-devuan-32-pae/bootloaders/isolinux/live.cfg new file mode 100644 index 00000000..1b1bee0f --- /dev/null +++ b/my-distro-devuan-32-pae/bootloaders/isolinux/live.cfg @@ -0,0 +1,12 @@ +label My-distro Live + menu label ^Live system (amd64) + menu default + linux /live/vmlinuz + initrd /live/initrd.img + append boot=live components quiet splash + +label My-distro Live-failsafe + menu label Live system (amd64 fail-safe mode) + linux /live/vmlinuz + initrd /live/initrd.img + append boot=live components memtest noapic noapm nodma nomce nolapic nosmp nosplash vga=788 diff --git a/my-distro-devuan-32-pae/bootloaders/isolinux/live.cfg.in b/my-distro-devuan-32-pae/bootloaders/isolinux/live.cfg.in deleted file mode 100644 index 97ceb92a..00000000 --- a/my-distro-devuan-32-pae/bootloaders/isolinux/live.cfg.in +++ /dev/null @@ -1,12 +0,0 @@ -label live-@FLAVOUR@ - menu label ^Live (@FLAVOUR@) - menu default - linux @LINUX@ - initrd @INITRD@ - append @APPEND_LIVE@ - -label live-@FLAVOUR@-failsafe - menu label ^Live (@FLAVOUR@ failsafe) - linux @LINUX@ - initrd @INITRD@ - append @APPEND_LIVE_FAILSAFE@ diff --git a/my-distro-devuan-32-pae/bootloaders/isolinux/menu.cfg b/my-distro-devuan-32-pae/bootloaders/isolinux/menu.cfg index 72845759..db4f2629 100644 --- a/my-distro-devuan-32-pae/bootloaders/isolinux/menu.cfg +++ b/my-distro-devuan-32-pae/bootloaders/isolinux/menu.cfg @@ -1,61 +1,18 @@ -INCLUDE stdmenu.cfg -MENU title Main Menu -DEFAULT My-distro Live -LABEL My-distro Live - SAY "Booting My-distro Live..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores +menu hshift 0 +menu width 82 -LABEL My-distro live failsafe - menu label My-distro Live failsafe - kernel /live/vmlinuz - append initrd=/live/initrd.img boot=live config noapic noapm nodma nomce nolapic pci=nomsi nomodeset radeon.modeset=0 nouveau.modeset=0 nosmp vga=normal autologin +menu title Boot menu +include stdmenu.cfg +include live.cfg +include install.cfg +menu begin utilities + menu label ^Utilities + menu title Utilities + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + include utilities.cfg +menu end -LABEL hd - menu label Boot the first hard disk - COM32 chain.c32 - APPEND hd0 - -MENU begin advanced -MENU title My-distro Live with Localisation Support -LABEL Portuguese (pt) - SAY "Booting Portuguese (pt)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=pt_PT.UTF-8 username=user hostname=My-distro keyboard-layouts=pt quiet splash - -LABEL Portuguese (Brazil) (pt_BR) - SAY "Booting Portuguese (Brazil) (pt_BR)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=pt_BR.UTF-8 username=user hostname=My-distro keyboard-layouts=br quiet splash - -LABEL English (en) - SAY "Booting English (en)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=en_US.UTF-8 username=user hostname=My-distro keyboard-layouts=en quiet splash - -LABEL French (fr) - SAY "Booting French (fr)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=fr_FR.UTF-8 username=user hostname=My-distro keyboard-layouts=fr quiet splash - -LABEL German (de) - SAY "Booting German (de)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=de_DE.UTF-8 username=user hostname=My-distro keyboard-layouts=de quiet splash - -LABEL Italian (it) - SAY "Booting Italian (it)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=it_IT.UTF-8 username=user hostname=My-distro keyboard-layouts=it quiet splash - -LABEL Spanish (es) - SAY "Booting Spanish (es)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=es_ES.UTF-8 username=user hostname=My-distro keyboard-layouts=es quiet splash - - LABEL mainmenu - MENU label Back - MENU exit - MENU end - -INCLUDE utilities.cfg +menu clear diff --git a/my-distro-devuan-32-pae/bootloaders/isolinux/splash800x600.png b/my-distro-devuan-32-pae/bootloaders/isolinux/splash800x600.png new file mode 100644 index 00000000..d4d4b2f7 Binary files /dev/null and b/my-distro-devuan-32-pae/bootloaders/isolinux/splash800x600.png differ diff --git a/my-distro-devuan-32-pae/bootloaders/isolinux/stdmenu.cfg b/my-distro-devuan-32-pae/bootloaders/isolinux/stdmenu.cfg index 39134698..671b16f7 100644 --- a/my-distro-devuan-32-pae/bootloaders/isolinux/stdmenu.cfg +++ b/my-distro-devuan-32-pae/bootloaders/isolinux/stdmenu.cfg @@ -5,14 +5,10 @@ menu color sel * #ffffffff #76a1d0ff * menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff * menu color tabmsg * #ffffffff #00000000 * menu color help 37;40 #ffdddd00 #00000000 none -# XXX When adjusting vshift, take care that rows is set to a small -# enough value so any possible menu will fit on the screen, -# rather than falling off the bottom. -menu vshift 8 -menu rows 8 -# The help line must be at least one line from the bottom. -menu helpmsgrow 14 -# The command line must be at least one line from the help line. +menu vshift 12 +menu rows 10 +menu helpmsgrow 15 +# The command line must be at least one line from the bottom. menu cmdlinerow 16 menu timeoutrow 16 menu tabmsgrow 18 diff --git a/my-distro-devuan-32-pae/bootloaders/isolinux/vesamenu.c32 b/my-distro-devuan-32-pae/bootloaders/isolinux/vesamenu.c32 new file mode 100644 index 00000000..bbb65e07 Binary files /dev/null and b/my-distro-devuan-32-pae/bootloaders/isolinux/vesamenu.c32 differ diff --git a/my-distro-devuan-32/bootloaders/boot/grub/config.cfg b/my-distro-devuan-32/bootloaders/boot/grub/config.cfg index 78b032f0..1061be0f 100644 --- a/my-distro-devuan-32/bootloaders/boot/grub/config.cfg +++ b/my-distro-devuan-32/bootloaders/boot/grub/config.cfg @@ -1,10 +1,24 @@ set default=0 -loadfont $prefix/dejavu-bold-16.pf2 -loadfont $prefix/dejavu-bold-14.pf2 -loadfont $prefix/unicode.pf2 -set gfxmode=auto -insmod all_video +if [ x$feature_default_font_path = xy ] ; then + font=unicode +else + font=$prefix/unicode.pf2 +fi + +# Copied from the netinst image +if loadfont $font ; then + set gfxmode=800x600 + set gfxpayload=keep + insmod efi_gop + insmod efi_uga + insmod video_bochs + insmod video_cirrus +else + set gfxmode=auto + insmod all_video +fi + insmod gfxterm insmod png @@ -12,6 +26,5 @@ source /boot/grub/theme.cfg terminal_output gfxterm -# Uncomment so grub beeps during boot insmod play play 960 440 1 0 4 440 1 diff --git a/my-distro-devuan-32/bootloaders/boot/grub/dejavu-bold-14.pf2 b/my-distro-devuan-32/bootloaders/boot/grub/dejavu-bold-14.pf2 deleted file mode 100644 index 9b093b20..00000000 Binary files a/my-distro-devuan-32/bootloaders/boot/grub/dejavu-bold-14.pf2 and /dev/null differ diff --git a/my-distro-devuan-32/bootloaders/boot/grub/dejavu-bold-16.pf2 b/my-distro-devuan-32/bootloaders/boot/grub/dejavu-bold-16.pf2 deleted file mode 100644 index 11e7f7ab..00000000 Binary files a/my-distro-devuan-32/bootloaders/boot/grub/dejavu-bold-16.pf2 and /dev/null differ diff --git a/my-distro-devuan-32/bootloaders/boot/grub/font.pf2 b/my-distro-devuan-32/bootloaders/boot/grub/font.pf2 deleted file mode 100644 index 59e8ffa6..00000000 Binary files a/my-distro-devuan-32/bootloaders/boot/grub/font.pf2 and /dev/null differ diff --git a/my-distro-devuan-32/bootloaders/boot/grub/grub.cfg b/my-distro-devuan-32/bootloaders/boot/grub/grub.cfg index 37dcd573..51999cfb 100644 --- a/my-distro-devuan-32/bootloaders/boot/grub/grub.cfg +++ b/my-distro-devuan-32/bootloaders/boot/grub/grub.cfg @@ -1,41 +1,57 @@ source /boot/grub/config.cfg -menuentry "My-distro Live" { - linux /live/vmlinuz boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "My-distro Live (fail-safe mode)" { - linux /live/initrd.img boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal +# Live boot +menuentry "My-distro Live)" --hotkey=l { + linux /live/vmlinuz boot=live components quiet splash findiso=${iso_path} initrd /live/initrd.img } -submenu "My-distro Live with Localisation Support" { -menuentry "Portuguese (pt)" { - linux /live/vmlinuz boot=live components locales=pt_PT.UTF-8 quiet splash keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "Portuguese (Brazil) (pt_BR)" { - linux /live/vmlinuz boot=live components locales=pt_BR.UTF-8 quiet splash keyboard-layouts=br username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "English (en)" { - linux /live/vmlinuz boot=live components locales=en_US.UTF-8 quiet splash keyboard-layouts=en username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "French (fr)" { - linux /live/vmlinuz boot=live components locales=fr_FR.UTF-8 quiet splash keyboard-layouts=fr username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "German (de)" { - linux /live/vmlinuz boot=live components locales=de_DE.UTF-8 quiet splash keyboard-layouts=de username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "Italian (it)" { - linux /live/vmlinuz boot=live components locales=it_IT.UTF-8 quiet splash keyboard-layouts=it username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "Spanish (es)" { - linux /live/vmlinuz boot=live components locales=es_ES.UTF-8 quiet splash keyboard-layouts=es username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} +menuentry "My-distro Live ( fail-safe mode)" { + linux /live/vmlinuz boot=live components memtest noapic noapm nodma nomce nolapic nosmp nosplash vga=788 + initrd /live/initrd.img } +# You can add more entries like this +# menuentry "Alternate live boot" { +# linux /live/vmlinuz boot=live components quiet splash findiso=${iso_path} custom options here +# initrd /live/initrd.img +# } +# menuentry "Alternate graphical installer" { +# linux /install/gtk/vmlinuz vga=788 --- quiet custom options here +# initrd /install/gtk/initrd.gz +# } +# menuentry "Alternate textual installer" { +# linux /install/vmlinuz vga=normal --- quiet custom options here +# initrd /install/initrd.gz +# } + +# Installer (if any) +if true; then + +source /boot/grub/install_start.cfg + +submenu 'Advanced install options ...' --hotkey=a { + + source /boot/grub/theme.cfg + + source /boot/grub/install.cfg + +} +fi + +submenu 'Utilities...' --hotkey=u { + + source /boot/grub/theme.cfg + + # Memtest (if any) + if false; then + source /boot/grub/memtest.cfg + fi + + # Firmware setup (UEFI) + if [ "${grub_platform}" = "efi" ]; then + menuentry "UEFI Firmware Settings" { + fwsetup + } + fi + +} diff --git a/my-distro-devuan-32/bootloaders/boot/grub/install.cfg b/my-distro-devuan-32/bootloaders/boot/grub/install.cfg new file mode 100644 index 00000000..6e6a5171 --- /dev/null +++ b/my-distro-devuan-32/bootloaders/boot/grub/install.cfg @@ -0,0 +1,124 @@ +submenu 'Graphical installer ...' --hotkey=g { + + source /boot/grub/theme.cfg + + menuentry 'Install' --hotkey=i { + linux /install/gtk/vmlinuz vga=788 --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Expert install' --hotkey=x { + linux /install/gtk/vmlinuz priority=low vga=788 + initrd /install/gtk/initrd.gz + } + + menuentry 'Automated install' --hotkey=a { + linux /install/gtk/vmlinuz auto=true priority=critical vga=788 --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Rescue mode' --hotkey=r { + linux /install/gtk/vmlinuz rescue/enable=true vga=788 --- quiet + initrd /install/gtk/initrd.gz + } +} + +submenu 'Text installer ...' --hotkey=t { + + source /boot/grub/theme.cfg + + menuentry 'Install' --hotkey=i { + linux /install/vmlinuz vga=788 --- quiet + initrd /install/initrd.gz + } + + menuentry 'Expert install' --hotkey=x { + linux /install/vmlinuz priority=low vga=788 + initrd /install/initrd.gz + } + + menuentry 'Automated install' --hotkey=a { + linux /install/vmlinuz auto=true priority=critical vga=788 --- quiet + initrd /install/initrd.gz + } + + menuentry 'Rescue mode' --hotkey=r { + linux /install/vmlinuz rescue/enable=true vga=788 --- quiet + initrd /install/initrd.gz + } +} + +submenu 'Graphical installer with dark theme ...' --hotkey=d { + + source /boot/grub/theme.cfg + + menuentry 'Install' --hotkey=i { + linux /install/gtk/vmlinuz vga=788 theme=dark --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Expert install' --hotkey=x { + linux /install/gtk/vmlinuz priority=low vga=788 theme=dark + initrd /install/gtk/initrd.gz + } + + menuentry 'Automated install' --hotkey=a { + linux /install/gtk/vmlinuz auto=true priority=critical vga=788 theme=dark --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Rescue mode' --hotkey=r { + linux /install/gtk/vmlinuz rescue/enable=true vga=788 theme=dark --- quiet + initrd /install/gtk/initrd.gz + } +} + +submenu 'Text installer with dark theme ...' --hotkey=k { + + source /boot/grub/theme.cfg + + menuentry 'Install' --hotkey=i { + linux /install/vmlinuz vga=788 theme=dark --- quiet + initrd /install/initrd.gz + } + + menuentry 'Expert install' --hotkey=x { + linux /install/vmlinuz priority=low vga=788 theme=dark + initrd /install/initrd.gz + } + + menuentry 'Automated install' --hotkey=a { + linux /install/vmlinuz auto=true priority=critical vga=788 theme=dark --- quiet + initrd /install/initrd.gz + } + + menuentry 'Rescue mode' --hotkey=r { + linux /install/vmlinuz rescue/enable=true vga=788 theme=dark --- quiet + initrd /install/initrd.gz + } +} + +submenu 'Installer with speech synthesis ...' --hotkey=s { + + source /boot/grub/theme.cfg + + menuentry 'Install' --hotkey=i { + linux /install/gtk/vmlinuz speakup.synth=soft vga=788 --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Expert install' --hotkey=x { + linux /install/gtk/vmlinuz speakup.synth=soft priority=low vga=788 + initrd /install/gtk/initrd.gz + } + + menuentry 'Automated install' --hotkey=a { + linux /install/gtk/vmlinuz speakup.synth=soft auto=true priority=critical vga=788 --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Rescue mode' --hotkey=r { + linux /install/gtk/vmlinuz speakup.synth=soft rescue/enable=true vga=788 --- quiet + initrd /install/gtk/initrd.gz + } +} diff --git a/my-distro-devuan-32/bootloaders/boot/grub/install_start.cfg b/my-distro-devuan-32/bootloaders/boot/grub/install_start.cfg new file mode 100644 index 00000000..24542254 --- /dev/null +++ b/my-distro-devuan-32/bootloaders/boot/grub/install_start.cfg @@ -0,0 +1,9 @@ +menuentry 'Start installer' --hotkey=i { + linux /install/gtk/vmlinuz vga=788 --- quiet + initrd /install/gtk/initrd.gz +} + +menuentry 'Start installer with speech synthesis' --hotkey=s { + linux /install/gtk/vmlinuz speakup.synth=soft vga=788 --- quiet + initrd /install/gtk/initrd.gz +} diff --git a/my-distro-devuan-32/bootloaders/boot/grub/live-theme/background.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/background.png index 59b84691..afbe78d0 100644 Binary files a/my-distro-devuan-32/bootloaders/boot/grub/live-theme/background.png and b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/background.png differ diff --git a/my-distro-devuan-32/bootloaders/boot/grub/loopback.cfg b/my-distro-devuan-32/bootloaders/boot/grub/loopback.cfg index b8e3b214..e94c44d2 100644 --- a/my-distro-devuan-32/bootloaders/boot/grub/loopback.cfg +++ b/my-distro-devuan-32/bootloaders/boot/grub/loopback.cfg @@ -1 +1 @@ -source /boot/grub/grub.cfg \ No newline at end of file +source /boot/grub/grub.cfg diff --git a/my-distro-devuan-32/bootloaders/boot/grub/unicode.pf2 b/my-distro-devuan-32/bootloaders/boot/grub/unicode.pf2 new file mode 100644 index 00000000..290ddc05 Binary files /dev/null and b/my-distro-devuan-32/bootloaders/boot/grub/unicode.pf2 differ diff --git a/my-distro-devuan-32/bootloaders/isolinux/chain.c32 b/my-distro-devuan-32/bootloaders/isolinux/chain.c32 deleted file mode 100644 index a9d6e0ea..00000000 Binary files a/my-distro-devuan-32/bootloaders/isolinux/chain.c32 and /dev/null differ diff --git a/my-distro-devuan-32/bootloaders/isolinux/hdt.c32 b/my-distro-devuan-32/bootloaders/isolinux/hdt.c32 new file mode 100644 index 00000000..d67d918c Binary files /dev/null and b/my-distro-devuan-32/bootloaders/isolinux/hdt.c32 differ diff --git a/my-distro-devuan-32/bootloaders/isolinux/install.cfg b/my-distro-devuan-32/bootloaders/isolinux/install.cfg new file mode 100644 index 00000000..7ad06704 --- /dev/null +++ b/my-distro-devuan-32/bootloaders/isolinux/install.cfg @@ -0,0 +1,185 @@ +label installstart + menu label Start ^installer + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append vga=788 --- quiet + +label installstartspeech + menu label Start installer with ^speech synthesis + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append speakup.synth=soft vga=788 --- quiet + +menu begin install + menu label ^Advanced install options + menu title Advanced install options + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + menu begin graphicalinstall + menu label ^Graphical installer + menu title Graphical installer + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + label installgui + menu label ^Install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append vga=788 --- quiet + + label expertgui + menu label E^xpert install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append priority=low vga=788 + + label autogui + menu label ^Automated install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append auto=true priority=critical vga=788 --- quiet + + label rescuegui + menu label ^Rescue mode + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append rescue/enable=true vga=788 --- quiet + menu end + + menu begin textinstall + menu label ^Text installer + menu title Text installer + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + label install + menu label ^Install + linux /install/vmlinuz + initrd /install/initrd.gz + append vga=788 --- quiet + + label expert + menu label E^xpert install + linux /install/vmlinuz + initrd /install/initrd.gz + append priority=low vga=788 + + label auto + menu label ^Automated install + linux /install/vmlinuz + initrd /install/initrd.gz + append auto=true priority=critical vga=788 --- quiet + + label rescue + menu label ^Rescue mode + linux /install/vmlinuz + initrd /install/initrd.gz + append rescue/enable=true vga=788 --- quiet + menu end + + menu begin graphicalinstalldark + menu label Graphical installer with ^dark theme + menu title Graphical installer with dark theme + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + label darkinstallgui + menu label ^Install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append vga=788 theme=dark --- quiet + + label darkexpertgui + menu label E^xpert install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append priority=low vga=788 theme=dark + + label darkautogui + menu label ^Automated install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append auto=true priority=critical vga=788 theme=dark --- quiet + + label darkrescuegui + menu label ^Rescue mode + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append rescue/enable=true vga=788 theme=dark --- quiet + menu end + + menu begin textinstalldark + menu label Text installer with dar^k theme + menu title Text installer with dark theme + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + label darkinstall + menu label ^Install + linux /install/vmlinuz + initrd /install/initrd.gz + append vga=788 theme=dark --- quiet + + label darkexpert + menu label E^xpert install + linux /install/vmlinuz + initrd /install/initrd.gz + append priority=low vga=788 theme=dark + + label darkauto + menu label ^Automated install + linux /install/vmlinuz + initrd /install/initrd.gz + append auto=true priority=critical vga=788 theme=dark --- quiet + + label darkrescue + menu label ^Rescue mode + linux /install/vmlinuz + initrd /install/initrd.gz + append rescue/enable=true vga=788 theme=dark --- quiet + menu end + + menu begin speechinstall + menu label Installer with ^speech synthesis + menu title Installer with speech synthesis + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + label installspeechsynth + menu label ^Install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append speakup.synth=soft vga=788 --- quiet + + label expertguispeech + menu label E^xpert install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append speakup.synth=soft priority=low vga=788 + + label autoguispeech + menu label ^Automated install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append speakup.synth=soft auto=true priority=critical vga=788 --- quiet + + label rescueguispeech + menu label ^Rescue mode + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append speakup.synth=soft rescue/enable=true vga=788 --- quiet + menu end +menu end diff --git a/my-distro-devuan-32/bootloaders/isolinux/isolinux.cfg b/my-distro-devuan-32/bootloaders/isolinux/isolinux.cfg index e5d0290d..a3e3eabc 100644 --- a/my-distro-devuan-32/bootloaders/isolinux/isolinux.cfg +++ b/my-distro-devuan-32/bootloaders/isolinux/isolinux.cfg @@ -1,6 +1,3 @@ -# D-I config version 2.0 -# search path for the c32 support libraries (libcom32, libutil etc.) -path include menu.cfg default vesamenu.c32 prompt 0 diff --git a/my-distro-devuan-32/bootloaders/isolinux/ldlinux.c32 b/my-distro-devuan-32/bootloaders/isolinux/ldlinux.c32 new file mode 100644 index 00000000..e94389bb Binary files /dev/null and b/my-distro-devuan-32/bootloaders/isolinux/ldlinux.c32 differ diff --git a/my-distro-devuan-32/bootloaders/isolinux/libcom32.c32 b/my-distro-devuan-32/bootloaders/isolinux/libcom32.c32 new file mode 100644 index 00000000..c4265b94 Binary files /dev/null and b/my-distro-devuan-32/bootloaders/isolinux/libcom32.c32 differ diff --git a/my-distro-devuan-32/bootloaders/isolinux/libgpl.c32 b/my-distro-devuan-32/bootloaders/isolinux/libgpl.c32 new file mode 100644 index 00000000..11f43f18 Binary files /dev/null and b/my-distro-devuan-32/bootloaders/isolinux/libgpl.c32 differ diff --git a/my-distro-devuan-32/bootloaders/isolinux/libmenu.c32 b/my-distro-devuan-32/bootloaders/isolinux/libmenu.c32 new file mode 100644 index 00000000..b3d69860 Binary files /dev/null and b/my-distro-devuan-32/bootloaders/isolinux/libmenu.c32 differ diff --git a/my-distro-devuan-32/bootloaders/isolinux/libutil.c32 b/my-distro-devuan-32/bootloaders/isolinux/libutil.c32 new file mode 100644 index 00000000..6fc1da7e Binary files /dev/null and b/my-distro-devuan-32/bootloaders/isolinux/libutil.c32 differ diff --git a/my-distro-devuan-32/bootloaders/isolinux/live.cfg b/my-distro-devuan-32/bootloaders/isolinux/live.cfg new file mode 100644 index 00000000..1b1bee0f --- /dev/null +++ b/my-distro-devuan-32/bootloaders/isolinux/live.cfg @@ -0,0 +1,12 @@ +label My-distro Live + menu label ^Live system (amd64) + menu default + linux /live/vmlinuz + initrd /live/initrd.img + append boot=live components quiet splash + +label My-distro Live-failsafe + menu label Live system (amd64 fail-safe mode) + linux /live/vmlinuz + initrd /live/initrd.img + append boot=live components memtest noapic noapm nodma nomce nolapic nosmp nosplash vga=788 diff --git a/my-distro-devuan-32/bootloaders/isolinux/live.cfg.in b/my-distro-devuan-32/bootloaders/isolinux/live.cfg.in deleted file mode 100644 index 97ceb92a..00000000 --- a/my-distro-devuan-32/bootloaders/isolinux/live.cfg.in +++ /dev/null @@ -1,12 +0,0 @@ -label live-@FLAVOUR@ - menu label ^Live (@FLAVOUR@) - menu default - linux @LINUX@ - initrd @INITRD@ - append @APPEND_LIVE@ - -label live-@FLAVOUR@-failsafe - menu label ^Live (@FLAVOUR@ failsafe) - linux @LINUX@ - initrd @INITRD@ - append @APPEND_LIVE_FAILSAFE@ diff --git a/my-distro-devuan-32/bootloaders/isolinux/menu.cfg b/my-distro-devuan-32/bootloaders/isolinux/menu.cfg index 72845759..db4f2629 100644 --- a/my-distro-devuan-32/bootloaders/isolinux/menu.cfg +++ b/my-distro-devuan-32/bootloaders/isolinux/menu.cfg @@ -1,61 +1,18 @@ -INCLUDE stdmenu.cfg -MENU title Main Menu -DEFAULT My-distro Live -LABEL My-distro Live - SAY "Booting My-distro Live..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores +menu hshift 0 +menu width 82 -LABEL My-distro live failsafe - menu label My-distro Live failsafe - kernel /live/vmlinuz - append initrd=/live/initrd.img boot=live config noapic noapm nodma nomce nolapic pci=nomsi nomodeset radeon.modeset=0 nouveau.modeset=0 nosmp vga=normal autologin +menu title Boot menu +include stdmenu.cfg +include live.cfg +include install.cfg +menu begin utilities + menu label ^Utilities + menu title Utilities + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + include utilities.cfg +menu end -LABEL hd - menu label Boot the first hard disk - COM32 chain.c32 - APPEND hd0 - -MENU begin advanced -MENU title My-distro Live with Localisation Support -LABEL Portuguese (pt) - SAY "Booting Portuguese (pt)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=pt_PT.UTF-8 username=user hostname=My-distro keyboard-layouts=pt quiet splash - -LABEL Portuguese (Brazil) (pt_BR) - SAY "Booting Portuguese (Brazil) (pt_BR)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=pt_BR.UTF-8 username=user hostname=My-distro keyboard-layouts=br quiet splash - -LABEL English (en) - SAY "Booting English (en)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=en_US.UTF-8 username=user hostname=My-distro keyboard-layouts=en quiet splash - -LABEL French (fr) - SAY "Booting French (fr)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=fr_FR.UTF-8 username=user hostname=My-distro keyboard-layouts=fr quiet splash - -LABEL German (de) - SAY "Booting German (de)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=de_DE.UTF-8 username=user hostname=My-distro keyboard-layouts=de quiet splash - -LABEL Italian (it) - SAY "Booting Italian (it)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=it_IT.UTF-8 username=user hostname=My-distro keyboard-layouts=it quiet splash - -LABEL Spanish (es) - SAY "Booting Spanish (es)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=es_ES.UTF-8 username=user hostname=My-distro keyboard-layouts=es quiet splash - - LABEL mainmenu - MENU label Back - MENU exit - MENU end - -INCLUDE utilities.cfg +menu clear diff --git a/my-distro-devuan-32/bootloaders/isolinux/splash800x600.png b/my-distro-devuan-32/bootloaders/isolinux/splash800x600.png new file mode 100644 index 00000000..d4d4b2f7 Binary files /dev/null and b/my-distro-devuan-32/bootloaders/isolinux/splash800x600.png differ diff --git a/my-distro-devuan-32/bootloaders/isolinux/stdmenu.cfg b/my-distro-devuan-32/bootloaders/isolinux/stdmenu.cfg index 39134698..671b16f7 100644 --- a/my-distro-devuan-32/bootloaders/isolinux/stdmenu.cfg +++ b/my-distro-devuan-32/bootloaders/isolinux/stdmenu.cfg @@ -5,14 +5,10 @@ menu color sel * #ffffffff #76a1d0ff * menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff * menu color tabmsg * #ffffffff #00000000 * menu color help 37;40 #ffdddd00 #00000000 none -# XXX When adjusting vshift, take care that rows is set to a small -# enough value so any possible menu will fit on the screen, -# rather than falling off the bottom. -menu vshift 8 -menu rows 8 -# The help line must be at least one line from the bottom. -menu helpmsgrow 14 -# The command line must be at least one line from the help line. +menu vshift 12 +menu rows 10 +menu helpmsgrow 15 +# The command line must be at least one line from the bottom. menu cmdlinerow 16 menu timeoutrow 16 menu tabmsgrow 18 diff --git a/my-distro-devuan-32/bootloaders/isolinux/vesamenu.c32 b/my-distro-devuan-32/bootloaders/isolinux/vesamenu.c32 new file mode 100644 index 00000000..bbb65e07 Binary files /dev/null and b/my-distro-devuan-32/bootloaders/isolinux/vesamenu.c32 differ diff --git a/my-distro-devuan-64/bootloaders/boot/grub/config.cfg b/my-distro-devuan-64/bootloaders/boot/grub/config.cfg index 78b032f0..1061be0f 100644 --- a/my-distro-devuan-64/bootloaders/boot/grub/config.cfg +++ b/my-distro-devuan-64/bootloaders/boot/grub/config.cfg @@ -1,10 +1,24 @@ set default=0 -loadfont $prefix/dejavu-bold-16.pf2 -loadfont $prefix/dejavu-bold-14.pf2 -loadfont $prefix/unicode.pf2 -set gfxmode=auto -insmod all_video +if [ x$feature_default_font_path = xy ] ; then + font=unicode +else + font=$prefix/unicode.pf2 +fi + +# Copied from the netinst image +if loadfont $font ; then + set gfxmode=800x600 + set gfxpayload=keep + insmod efi_gop + insmod efi_uga + insmod video_bochs + insmod video_cirrus +else + set gfxmode=auto + insmod all_video +fi + insmod gfxterm insmod png @@ -12,6 +26,5 @@ source /boot/grub/theme.cfg terminal_output gfxterm -# Uncomment so grub beeps during boot insmod play play 960 440 1 0 4 440 1 diff --git a/my-distro-devuan-64/bootloaders/boot/grub/dejavu-bold-14.pf2 b/my-distro-devuan-64/bootloaders/boot/grub/dejavu-bold-14.pf2 deleted file mode 100644 index 9b093b20..00000000 Binary files a/my-distro-devuan-64/bootloaders/boot/grub/dejavu-bold-14.pf2 and /dev/null differ diff --git a/my-distro-devuan-64/bootloaders/boot/grub/dejavu-bold-16.pf2 b/my-distro-devuan-64/bootloaders/boot/grub/dejavu-bold-16.pf2 deleted file mode 100644 index 11e7f7ab..00000000 Binary files a/my-distro-devuan-64/bootloaders/boot/grub/dejavu-bold-16.pf2 and /dev/null differ diff --git a/my-distro-devuan-64/bootloaders/boot/grub/font.pf2 b/my-distro-devuan-64/bootloaders/boot/grub/font.pf2 deleted file mode 100644 index 59e8ffa6..00000000 Binary files a/my-distro-devuan-64/bootloaders/boot/grub/font.pf2 and /dev/null differ diff --git a/my-distro-devuan-64/bootloaders/boot/grub/grub.cfg b/my-distro-devuan-64/bootloaders/boot/grub/grub.cfg index 37dcd573..51999cfb 100644 --- a/my-distro-devuan-64/bootloaders/boot/grub/grub.cfg +++ b/my-distro-devuan-64/bootloaders/boot/grub/grub.cfg @@ -1,41 +1,57 @@ source /boot/grub/config.cfg -menuentry "My-distro Live" { - linux /live/vmlinuz boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "My-distro Live (fail-safe mode)" { - linux /live/initrd.img boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal +# Live boot +menuentry "My-distro Live)" --hotkey=l { + linux /live/vmlinuz boot=live components quiet splash findiso=${iso_path} initrd /live/initrd.img } -submenu "My-distro Live with Localisation Support" { -menuentry "Portuguese (pt)" { - linux /live/vmlinuz boot=live components locales=pt_PT.UTF-8 quiet splash keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "Portuguese (Brazil) (pt_BR)" { - linux /live/vmlinuz boot=live components locales=pt_BR.UTF-8 quiet splash keyboard-layouts=br username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "English (en)" { - linux /live/vmlinuz boot=live components locales=en_US.UTF-8 quiet splash keyboard-layouts=en username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "French (fr)" { - linux /live/vmlinuz boot=live components locales=fr_FR.UTF-8 quiet splash keyboard-layouts=fr username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "German (de)" { - linux /live/vmlinuz boot=live components locales=de_DE.UTF-8 quiet splash keyboard-layouts=de username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "Italian (it)" { - linux /live/vmlinuz boot=live components locales=it_IT.UTF-8 quiet splash keyboard-layouts=it username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "Spanish (es)" { - linux /live/vmlinuz boot=live components locales=es_ES.UTF-8 quiet splash keyboard-layouts=es username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} +menuentry "My-distro Live ( fail-safe mode)" { + linux /live/vmlinuz boot=live components memtest noapic noapm nodma nomce nolapic nosmp nosplash vga=788 + initrd /live/initrd.img } +# You can add more entries like this +# menuentry "Alternate live boot" { +# linux /live/vmlinuz boot=live components quiet splash findiso=${iso_path} custom options here +# initrd /live/initrd.img +# } +# menuentry "Alternate graphical installer" { +# linux /install/gtk/vmlinuz vga=788 --- quiet custom options here +# initrd /install/gtk/initrd.gz +# } +# menuentry "Alternate textual installer" { +# linux /install/vmlinuz vga=normal --- quiet custom options here +# initrd /install/initrd.gz +# } + +# Installer (if any) +if true; then + +source /boot/grub/install_start.cfg + +submenu 'Advanced install options ...' --hotkey=a { + + source /boot/grub/theme.cfg + + source /boot/grub/install.cfg + +} +fi + +submenu 'Utilities...' --hotkey=u { + + source /boot/grub/theme.cfg + + # Memtest (if any) + if false; then + source /boot/grub/memtest.cfg + fi + + # Firmware setup (UEFI) + if [ "${grub_platform}" = "efi" ]; then + menuentry "UEFI Firmware Settings" { + fwsetup + } + fi + +} diff --git a/my-distro-devuan-64/bootloaders/boot/grub/install.cfg b/my-distro-devuan-64/bootloaders/boot/grub/install.cfg new file mode 100644 index 00000000..6e6a5171 --- /dev/null +++ b/my-distro-devuan-64/bootloaders/boot/grub/install.cfg @@ -0,0 +1,124 @@ +submenu 'Graphical installer ...' --hotkey=g { + + source /boot/grub/theme.cfg + + menuentry 'Install' --hotkey=i { + linux /install/gtk/vmlinuz vga=788 --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Expert install' --hotkey=x { + linux /install/gtk/vmlinuz priority=low vga=788 + initrd /install/gtk/initrd.gz + } + + menuentry 'Automated install' --hotkey=a { + linux /install/gtk/vmlinuz auto=true priority=critical vga=788 --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Rescue mode' --hotkey=r { + linux /install/gtk/vmlinuz rescue/enable=true vga=788 --- quiet + initrd /install/gtk/initrd.gz + } +} + +submenu 'Text installer ...' --hotkey=t { + + source /boot/grub/theme.cfg + + menuentry 'Install' --hotkey=i { + linux /install/vmlinuz vga=788 --- quiet + initrd /install/initrd.gz + } + + menuentry 'Expert install' --hotkey=x { + linux /install/vmlinuz priority=low vga=788 + initrd /install/initrd.gz + } + + menuentry 'Automated install' --hotkey=a { + linux /install/vmlinuz auto=true priority=critical vga=788 --- quiet + initrd /install/initrd.gz + } + + menuentry 'Rescue mode' --hotkey=r { + linux /install/vmlinuz rescue/enable=true vga=788 --- quiet + initrd /install/initrd.gz + } +} + +submenu 'Graphical installer with dark theme ...' --hotkey=d { + + source /boot/grub/theme.cfg + + menuentry 'Install' --hotkey=i { + linux /install/gtk/vmlinuz vga=788 theme=dark --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Expert install' --hotkey=x { + linux /install/gtk/vmlinuz priority=low vga=788 theme=dark + initrd /install/gtk/initrd.gz + } + + menuentry 'Automated install' --hotkey=a { + linux /install/gtk/vmlinuz auto=true priority=critical vga=788 theme=dark --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Rescue mode' --hotkey=r { + linux /install/gtk/vmlinuz rescue/enable=true vga=788 theme=dark --- quiet + initrd /install/gtk/initrd.gz + } +} + +submenu 'Text installer with dark theme ...' --hotkey=k { + + source /boot/grub/theme.cfg + + menuentry 'Install' --hotkey=i { + linux /install/vmlinuz vga=788 theme=dark --- quiet + initrd /install/initrd.gz + } + + menuentry 'Expert install' --hotkey=x { + linux /install/vmlinuz priority=low vga=788 theme=dark + initrd /install/initrd.gz + } + + menuentry 'Automated install' --hotkey=a { + linux /install/vmlinuz auto=true priority=critical vga=788 theme=dark --- quiet + initrd /install/initrd.gz + } + + menuentry 'Rescue mode' --hotkey=r { + linux /install/vmlinuz rescue/enable=true vga=788 theme=dark --- quiet + initrd /install/initrd.gz + } +} + +submenu 'Installer with speech synthesis ...' --hotkey=s { + + source /boot/grub/theme.cfg + + menuentry 'Install' --hotkey=i { + linux /install/gtk/vmlinuz speakup.synth=soft vga=788 --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Expert install' --hotkey=x { + linux /install/gtk/vmlinuz speakup.synth=soft priority=low vga=788 + initrd /install/gtk/initrd.gz + } + + menuentry 'Automated install' --hotkey=a { + linux /install/gtk/vmlinuz speakup.synth=soft auto=true priority=critical vga=788 --- quiet + initrd /install/gtk/initrd.gz + } + + menuentry 'Rescue mode' --hotkey=r { + linux /install/gtk/vmlinuz speakup.synth=soft rescue/enable=true vga=788 --- quiet + initrd /install/gtk/initrd.gz + } +} diff --git a/my-distro-devuan-64/bootloaders/boot/grub/install_start.cfg b/my-distro-devuan-64/bootloaders/boot/grub/install_start.cfg new file mode 100644 index 00000000..24542254 --- /dev/null +++ b/my-distro-devuan-64/bootloaders/boot/grub/install_start.cfg @@ -0,0 +1,9 @@ +menuentry 'Start installer' --hotkey=i { + linux /install/gtk/vmlinuz vga=788 --- quiet + initrd /install/gtk/initrd.gz +} + +menuentry 'Start installer with speech synthesis' --hotkey=s { + linux /install/gtk/vmlinuz speakup.synth=soft vga=788 --- quiet + initrd /install/gtk/initrd.gz +} diff --git a/my-distro-devuan-64/bootloaders/boot/grub/live-theme/background.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/background.png index 59b84691..afbe78d0 100644 Binary files a/my-distro-devuan-64/bootloaders/boot/grub/live-theme/background.png and b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/background.png differ diff --git a/my-distro-devuan-64/bootloaders/boot/grub/loopback.cfg b/my-distro-devuan-64/bootloaders/boot/grub/loopback.cfg index b8e3b214..e94c44d2 100644 --- a/my-distro-devuan-64/bootloaders/boot/grub/loopback.cfg +++ b/my-distro-devuan-64/bootloaders/boot/grub/loopback.cfg @@ -1 +1 @@ -source /boot/grub/grub.cfg \ No newline at end of file +source /boot/grub/grub.cfg diff --git a/my-distro-devuan-64/bootloaders/boot/grub/unicode.pf2 b/my-distro-devuan-64/bootloaders/boot/grub/unicode.pf2 new file mode 100644 index 00000000..290ddc05 Binary files /dev/null and b/my-distro-devuan-64/bootloaders/boot/grub/unicode.pf2 differ diff --git a/my-distro-devuan-64/bootloaders/isolinux/chain.c32 b/my-distro-devuan-64/bootloaders/isolinux/chain.c32 deleted file mode 100644 index a9d6e0ea..00000000 Binary files a/my-distro-devuan-64/bootloaders/isolinux/chain.c32 and /dev/null differ diff --git a/my-distro-devuan-64/bootloaders/isolinux/hdt.c32 b/my-distro-devuan-64/bootloaders/isolinux/hdt.c32 new file mode 100644 index 00000000..d67d918c Binary files /dev/null and b/my-distro-devuan-64/bootloaders/isolinux/hdt.c32 differ diff --git a/my-distro-devuan-64/bootloaders/isolinux/install.cfg b/my-distro-devuan-64/bootloaders/isolinux/install.cfg new file mode 100644 index 00000000..7ad06704 --- /dev/null +++ b/my-distro-devuan-64/bootloaders/isolinux/install.cfg @@ -0,0 +1,185 @@ +label installstart + menu label Start ^installer + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append vga=788 --- quiet + +label installstartspeech + menu label Start installer with ^speech synthesis + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append speakup.synth=soft vga=788 --- quiet + +menu begin install + menu label ^Advanced install options + menu title Advanced install options + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + menu begin graphicalinstall + menu label ^Graphical installer + menu title Graphical installer + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + label installgui + menu label ^Install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append vga=788 --- quiet + + label expertgui + menu label E^xpert install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append priority=low vga=788 + + label autogui + menu label ^Automated install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append auto=true priority=critical vga=788 --- quiet + + label rescuegui + menu label ^Rescue mode + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append rescue/enable=true vga=788 --- quiet + menu end + + menu begin textinstall + menu label ^Text installer + menu title Text installer + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + label install + menu label ^Install + linux /install/vmlinuz + initrd /install/initrd.gz + append vga=788 --- quiet + + label expert + menu label E^xpert install + linux /install/vmlinuz + initrd /install/initrd.gz + append priority=low vga=788 + + label auto + menu label ^Automated install + linux /install/vmlinuz + initrd /install/initrd.gz + append auto=true priority=critical vga=788 --- quiet + + label rescue + menu label ^Rescue mode + linux /install/vmlinuz + initrd /install/initrd.gz + append rescue/enable=true vga=788 --- quiet + menu end + + menu begin graphicalinstalldark + menu label Graphical installer with ^dark theme + menu title Graphical installer with dark theme + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + label darkinstallgui + menu label ^Install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append vga=788 theme=dark --- quiet + + label darkexpertgui + menu label E^xpert install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append priority=low vga=788 theme=dark + + label darkautogui + menu label ^Automated install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append auto=true priority=critical vga=788 theme=dark --- quiet + + label darkrescuegui + menu label ^Rescue mode + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append rescue/enable=true vga=788 theme=dark --- quiet + menu end + + menu begin textinstalldark + menu label Text installer with dar^k theme + menu title Text installer with dark theme + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + label darkinstall + menu label ^Install + linux /install/vmlinuz + initrd /install/initrd.gz + append vga=788 theme=dark --- quiet + + label darkexpert + menu label E^xpert install + linux /install/vmlinuz + initrd /install/initrd.gz + append priority=low vga=788 theme=dark + + label darkauto + menu label ^Automated install + linux /install/vmlinuz + initrd /install/initrd.gz + append auto=true priority=critical vga=788 theme=dark --- quiet + + label darkrescue + menu label ^Rescue mode + linux /install/vmlinuz + initrd /install/initrd.gz + append rescue/enable=true vga=788 theme=dark --- quiet + menu end + + menu begin speechinstall + menu label Installer with ^speech synthesis + menu title Installer with speech synthesis + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + + label installspeechsynth + menu label ^Install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append speakup.synth=soft vga=788 --- quiet + + label expertguispeech + menu label E^xpert install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append speakup.synth=soft priority=low vga=788 + + label autoguispeech + menu label ^Automated install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append speakup.synth=soft auto=true priority=critical vga=788 --- quiet + + label rescueguispeech + menu label ^Rescue mode + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append speakup.synth=soft rescue/enable=true vga=788 --- quiet + menu end +menu end diff --git a/my-distro-devuan-64/bootloaders/isolinux/isolinux.cfg b/my-distro-devuan-64/bootloaders/isolinux/isolinux.cfg index e5d0290d..a3e3eabc 100644 --- a/my-distro-devuan-64/bootloaders/isolinux/isolinux.cfg +++ b/my-distro-devuan-64/bootloaders/isolinux/isolinux.cfg @@ -1,6 +1,3 @@ -# D-I config version 2.0 -# search path for the c32 support libraries (libcom32, libutil etc.) -path include menu.cfg default vesamenu.c32 prompt 0 diff --git a/my-distro-devuan-64/bootloaders/isolinux/ldlinux.c32 b/my-distro-devuan-64/bootloaders/isolinux/ldlinux.c32 new file mode 100644 index 00000000..e94389bb Binary files /dev/null and b/my-distro-devuan-64/bootloaders/isolinux/ldlinux.c32 differ diff --git a/my-distro-devuan-64/bootloaders/isolinux/libcom32.c32 b/my-distro-devuan-64/bootloaders/isolinux/libcom32.c32 new file mode 100644 index 00000000..c4265b94 Binary files /dev/null and b/my-distro-devuan-64/bootloaders/isolinux/libcom32.c32 differ diff --git a/my-distro-devuan-64/bootloaders/isolinux/libgpl.c32 b/my-distro-devuan-64/bootloaders/isolinux/libgpl.c32 new file mode 100644 index 00000000..11f43f18 Binary files /dev/null and b/my-distro-devuan-64/bootloaders/isolinux/libgpl.c32 differ diff --git a/my-distro-devuan-64/bootloaders/isolinux/libmenu.c32 b/my-distro-devuan-64/bootloaders/isolinux/libmenu.c32 new file mode 100644 index 00000000..b3d69860 Binary files /dev/null and b/my-distro-devuan-64/bootloaders/isolinux/libmenu.c32 differ diff --git a/my-distro-devuan-64/bootloaders/isolinux/libutil.c32 b/my-distro-devuan-64/bootloaders/isolinux/libutil.c32 new file mode 100644 index 00000000..6fc1da7e Binary files /dev/null and b/my-distro-devuan-64/bootloaders/isolinux/libutil.c32 differ diff --git a/my-distro-devuan-64/bootloaders/isolinux/live.cfg b/my-distro-devuan-64/bootloaders/isolinux/live.cfg new file mode 100644 index 00000000..1b1bee0f --- /dev/null +++ b/my-distro-devuan-64/bootloaders/isolinux/live.cfg @@ -0,0 +1,12 @@ +label My-distro Live + menu label ^Live system (amd64) + menu default + linux /live/vmlinuz + initrd /live/initrd.img + append boot=live components quiet splash + +label My-distro Live-failsafe + menu label Live system (amd64 fail-safe mode) + linux /live/vmlinuz + initrd /live/initrd.img + append boot=live components memtest noapic noapm nodma nomce nolapic nosmp nosplash vga=788 diff --git a/my-distro-devuan-64/bootloaders/isolinux/live.cfg.in b/my-distro-devuan-64/bootloaders/isolinux/live.cfg.in deleted file mode 100644 index 97ceb92a..00000000 --- a/my-distro-devuan-64/bootloaders/isolinux/live.cfg.in +++ /dev/null @@ -1,12 +0,0 @@ -label live-@FLAVOUR@ - menu label ^Live (@FLAVOUR@) - menu default - linux @LINUX@ - initrd @INITRD@ - append @APPEND_LIVE@ - -label live-@FLAVOUR@-failsafe - menu label ^Live (@FLAVOUR@ failsafe) - linux @LINUX@ - initrd @INITRD@ - append @APPEND_LIVE_FAILSAFE@ diff --git a/my-distro-devuan-64/bootloaders/isolinux/menu.cfg b/my-distro-devuan-64/bootloaders/isolinux/menu.cfg index 72845759..db4f2629 100644 --- a/my-distro-devuan-64/bootloaders/isolinux/menu.cfg +++ b/my-distro-devuan-64/bootloaders/isolinux/menu.cfg @@ -1,61 +1,18 @@ -INCLUDE stdmenu.cfg -MENU title Main Menu -DEFAULT My-distro Live -LABEL My-distro Live - SAY "Booting My-distro Live..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores +menu hshift 0 +menu width 82 -LABEL My-distro live failsafe - menu label My-distro Live failsafe - kernel /live/vmlinuz - append initrd=/live/initrd.img boot=live config noapic noapm nodma nomce nolapic pci=nomsi nomodeset radeon.modeset=0 nouveau.modeset=0 nosmp vga=normal autologin +menu title Boot menu +include stdmenu.cfg +include live.cfg +include install.cfg +menu begin utilities + menu label ^Utilities + menu title Utilities + include stdmenu.cfg + label mainmenu + menu label ^Back.. + menu exit + include utilities.cfg +menu end -LABEL hd - menu label Boot the first hard disk - COM32 chain.c32 - APPEND hd0 - -MENU begin advanced -MENU title My-distro Live with Localisation Support -LABEL Portuguese (pt) - SAY "Booting Portuguese (pt)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=pt_PT.UTF-8 username=user hostname=My-distro keyboard-layouts=pt quiet splash - -LABEL Portuguese (Brazil) (pt_BR) - SAY "Booting Portuguese (Brazil) (pt_BR)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=pt_BR.UTF-8 username=user hostname=My-distro keyboard-layouts=br quiet splash - -LABEL English (en) - SAY "Booting English (en)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=en_US.UTF-8 username=user hostname=My-distro keyboard-layouts=en quiet splash - -LABEL French (fr) - SAY "Booting French (fr)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=fr_FR.UTF-8 username=user hostname=My-distro keyboard-layouts=fr quiet splash - -LABEL German (de) - SAY "Booting German (de)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=de_DE.UTF-8 username=user hostname=My-distro keyboard-layouts=de quiet splash - -LABEL Italian (it) - SAY "Booting Italian (it)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=it_IT.UTF-8 username=user hostname=My-distro keyboard-layouts=it quiet splash - -LABEL Spanish (es) - SAY "Booting Spanish (es)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=es_ES.UTF-8 username=user hostname=My-distro keyboard-layouts=es quiet splash - - LABEL mainmenu - MENU label Back - MENU exit - MENU end - -INCLUDE utilities.cfg +menu clear diff --git a/my-distro-devuan-64/bootloaders/isolinux/splash800x600.png b/my-distro-devuan-64/bootloaders/isolinux/splash800x600.png new file mode 100644 index 00000000..d4d4b2f7 Binary files /dev/null and b/my-distro-devuan-64/bootloaders/isolinux/splash800x600.png differ diff --git a/my-distro-devuan-64/bootloaders/isolinux/stdmenu.cfg b/my-distro-devuan-64/bootloaders/isolinux/stdmenu.cfg index 39134698..671b16f7 100644 --- a/my-distro-devuan-64/bootloaders/isolinux/stdmenu.cfg +++ b/my-distro-devuan-64/bootloaders/isolinux/stdmenu.cfg @@ -5,14 +5,10 @@ menu color sel * #ffffffff #76a1d0ff * menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff * menu color tabmsg * #ffffffff #00000000 * menu color help 37;40 #ffdddd00 #00000000 none -# XXX When adjusting vshift, take care that rows is set to a small -# enough value so any possible menu will fit on the screen, -# rather than falling off the bottom. -menu vshift 8 -menu rows 8 -# The help line must be at least one line from the bottom. -menu helpmsgrow 14 -# The command line must be at least one line from the help line. +menu vshift 12 +menu rows 10 +menu helpmsgrow 15 +# The command line must be at least one line from the bottom. menu cmdlinerow 16 menu timeoutrow 16 menu tabmsgrow 18 diff --git a/my-distro-devuan-64/bootloaders/isolinux/vesamenu.c32 b/my-distro-devuan-64/bootloaders/isolinux/vesamenu.c32 new file mode 100644 index 00000000..bbb65e07 Binary files /dev/null and b/my-distro-devuan-64/bootloaders/isolinux/vesamenu.c32 differ diff --git a/my-distro-ubuntu-64/BldHelper.sh b/my-distro-ubuntu-64/BldHelper.sh deleted file mode 100755 index 5e73056c..00000000 --- a/my-distro-ubuntu-64/BldHelper.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -################################################################################ -# Title: Bldhelper.sh -# Description: Script to build My-distro ISO image -# Author: manuel rosa -# Date: Outubro 29, 2023 -# License: GPL-3.0-or-later -################################################################################ - -# Set environment variables -PREFIX=My-distro-ubuntu -SUFFIX=amd64 -BUILD=ubuntu-64 -FileName="${PREFIX}-${SUFFIX}" -LOCATION=/var/www/html/nightly/my-distro-di/${BUILD} -LogDir=/var/log/Live-Build -WorkingDir=/home/manuel/My-distro-DI-configs/my-distro-ubuntu-64 - -# Execute the ISO building script -cd ${WorkingDir} -./build.sh - -# Move and rename the ISO file -cd build -mv *.iso ${FileName}-${TODAY}.iso - -# Create the checksum file for the ISO -sha512sum ${FileName}-${TODAY}.iso > ${FileName}-${TODAY}-sha512.checksum - -# Remove old ISO and checksum files from the desired location -rm -f ${LOCATION}/${FileName}*.iso -rm -f ${LOCATION}/${FileName}*-sha512.checksum - -# Move the ISO and checksum files to the desired location -mkdir -p ${LOCATION} -mv ${FileName}-${TODAY}.iso ${LOCATION} -mv ${FileName}-${TODAY}-sha512.checksum ${LOCATION} - -# Move the log file to the log directory (if it exists) -if [ -f /tmp/${PREFIX}${SUFFIX}.out ]; then - mv /tmp/${PREFIX}${SUFFIX}.out ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log -fi - -# Clean the build folder -lb clean - -# Remove the "fusato" directory and its contents -cd .. -rm -rf build - diff --git a/my-distro-ubuntu-64/applications b/my-distro-ubuntu-64/applications deleted file mode 120000 index 32c37e2d..00000000 --- a/my-distro-ubuntu-64/applications +++ /dev/null @@ -1 +0,0 @@ -../applications \ No newline at end of file diff --git a/my-distro-ubuntu-64/backgrounds b/my-distro-ubuntu-64/backgrounds deleted file mode 120000 index bddeeb98..00000000 --- a/my-distro-ubuntu-64/backgrounds +++ /dev/null @@ -1 +0,0 @@ -../backgrounds \ No newline at end of file diff --git a/my-distro-ubuntu-64/bootloader-config/bootloader-config b/my-distro-ubuntu-64/bootloader-config/bootloader-config deleted file mode 100755 index 1ebe9bcb..00000000 --- a/my-distro-ubuntu-64/bootloader-config/bootloader-config +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") - -# Set secure permissions for the initramfs if we're configuring -# full-disk-encryption. The initramfs is re-generated later in the -# installation process so we only set the permissions snippet without -# regenerating the initramfs right now: -if [ "$(mount | grep $CHROOT" " | cut -c -16)" = "/dev/mapper/luks" ]; then - echo "UMASK=0077" > $CHROOT/etc/initramfs-tools/conf.d/initramfs-permissions -fi - -echo "Running bootloader-config..." - -if [ -d /sys/firmware/efi/efivars ]; then - echo " * Installing grub-efi (uefi)..." - DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-amd64-signed cryptsetup keyutils shim-signed -else - echo " * install grub... (bios)" - DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc cryptsetup keyutils -fi diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/config.cfg b/my-distro-ubuntu-64/bootloaders/boot/grub/config.cfg deleted file mode 100644 index 78b032f0..00000000 --- a/my-distro-ubuntu-64/bootloaders/boot/grub/config.cfg +++ /dev/null @@ -1,17 +0,0 @@ -set default=0 - -loadfont $prefix/dejavu-bold-16.pf2 -loadfont $prefix/dejavu-bold-14.pf2 -loadfont $prefix/unicode.pf2 -set gfxmode=auto -insmod all_video -insmod gfxterm -insmod png - -source /boot/grub/theme.cfg - -terminal_output gfxterm - -# Uncomment so grub beeps during boot -insmod play -play 960 440 1 0 4 440 1 diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/dejavu-bold-14.pf2 b/my-distro-ubuntu-64/bootloaders/boot/grub/dejavu-bold-14.pf2 deleted file mode 100644 index 9b093b20..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/dejavu-bold-14.pf2 and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/dejavu-bold-16.pf2 b/my-distro-ubuntu-64/bootloaders/boot/grub/dejavu-bold-16.pf2 deleted file mode 100644 index 11e7f7ab..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/dejavu-bold-16.pf2 and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/font.pf2 b/my-distro-ubuntu-64/bootloaders/boot/grub/font.pf2 deleted file mode 100644 index 59e8ffa6..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/font.pf2 and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/grub.cfg b/my-distro-ubuntu-64/bootloaders/boot/grub/grub.cfg deleted file mode 100644 index 37dcd573..00000000 --- a/my-distro-ubuntu-64/bootloaders/boot/grub/grub.cfg +++ /dev/null @@ -1,41 +0,0 @@ -source /boot/grub/config.cfg - -menuentry "My-distro Live" { - linux /live/vmlinuz boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "My-distro Live (fail-safe mode)" { - linux /live/initrd.img boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal - initrd /live/initrd.img -} -submenu "My-distro Live with Localisation Support" { -menuentry "Portuguese (pt)" { - linux /live/vmlinuz boot=live components locales=pt_PT.UTF-8 quiet splash keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "Portuguese (Brazil) (pt_BR)" { - linux /live/vmlinuz boot=live components locales=pt_BR.UTF-8 quiet splash keyboard-layouts=br username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "English (en)" { - linux /live/vmlinuz boot=live components locales=en_US.UTF-8 quiet splash keyboard-layouts=en username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "French (fr)" { - linux /live/vmlinuz boot=live components locales=fr_FR.UTF-8 quiet splash keyboard-layouts=fr username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "German (de)" { - linux /live/vmlinuz boot=live components locales=de_DE.UTF-8 quiet splash keyboard-layouts=de username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "Italian (it)" { - linux /live/vmlinuz boot=live components locales=it_IT.UTF-8 quiet splash keyboard-layouts=it username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "Spanish (es)" { - linux /live/vmlinuz boot=live components locales=es_ES.UTF-8 quiet splash keyboard-layouts=es username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -} - diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/background.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/background.png deleted file mode 100644 index cc4e08f1..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/background.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/4MLinux.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/4MLinux.png deleted file mode 100644 index 1c6fe5e2..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/4MLinux.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/AlpineLinux.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/AlpineLinux.png deleted file mode 100644 index 6212a1fa..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/AlpineLinux.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/Manjaro.i686.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/Manjaro.i686.png deleted file mode 100644 index 611a6fbc..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/Manjaro.i686.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/Manjaro.x86_64.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/Manjaro.x86_64.png deleted file mode 100644 index 611a6fbc..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/Manjaro.x86_64.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/SystemRescueCD.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/SystemRescueCD.png deleted file mode 100644 index 7c41182f..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/SystemRescueCD.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/android.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/android.png deleted file mode 100644 index dad066f5..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/android.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/anonymous.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/anonymous.png deleted file mode 100644 index 7d165b67..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/anonymous.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/antergos.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/antergos.png deleted file mode 100644 index 32e3a3a3..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/antergos.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/arch.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/arch.png deleted file mode 100644 index f6cd8704..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/arch.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/archlinux.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/archlinux.png deleted file mode 100644 index f6cd8704..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/archlinux.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/arcolinux.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/arcolinux.png deleted file mode 100644 index c5e5e5ea..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/arcolinux.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/artix.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/artix.png deleted file mode 100644 index 0cbeb11c..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/artix.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/bedrock.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/bedrock.png deleted file mode 100644 index 58ff48a8..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/bedrock.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/cancel.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/cancel.png deleted file mode 100644 index fca2ac9d..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/cancel.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/centos.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/centos.png deleted file mode 100644 index 23fe2fa5..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/centos.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/chakra.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/chakra.png deleted file mode 100644 index 6f63a959..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/chakra.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/debian.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/debian.png deleted file mode 100644 index 20bea8c2..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/debian.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/deepin.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/deepin.png deleted file mode 100644 index 61c92fb4..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/deepin.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/devuan.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/devuan.png deleted file mode 100644 index ff654016..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/devuan.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/driver.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/driver.png deleted file mode 100644 index 1621ee7f..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/driver.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/edit.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/edit.png deleted file mode 100644 index 6a43bd99..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/edit.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/efi.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/efi.png deleted file mode 100644 index 4ecf3b98..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/efi.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/elementary.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/elementary.png deleted file mode 100644 index 2840354c..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/elementary.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/endeavouros.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/endeavouros.png deleted file mode 100644 index 6b1e530d..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/endeavouros.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/fedora.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/fedora.png deleted file mode 100644 index 926b56d1..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/fedora.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/find.efi.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/find.efi.png deleted file mode 100644 index 0e32321a..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/find.efi.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/find.none.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/find.none.png deleted file mode 100644 index 87d4d0ec..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/find.none.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/freebsd.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/freebsd.png deleted file mode 100644 index fb9408cf..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/freebsd.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/garuda.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/garuda.png deleted file mode 100644 index f699718a..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/garuda.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/gentoo.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/gentoo.png deleted file mode 100644 index bc0ed705..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/gentoo.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/gnu-linux.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/gnu-linux.png deleted file mode 100644 index 326b6596..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/gnu-linux.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/haiku.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/haiku.png deleted file mode 100644 index ce7f8182..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/haiku.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/help.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/help.png deleted file mode 100644 index d8b5a173..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/help.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/kali.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/kali.png deleted file mode 100644 index 900dc82e..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/kali.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/kaos.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/kaos.png deleted file mode 100644 index 9fd4e891..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/kaos.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/kbd.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/kbd.png deleted file mode 100644 index 6ace3ace..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/kbd.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/korora.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/korora.png deleted file mode 100644 index 456e8764..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/korora.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/kubuntu.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/kubuntu.png deleted file mode 100644 index 7a79ff32..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/kubuntu.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/lang.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/lang.png deleted file mode 100644 index 3c9c1d79..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/lang.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/lfs.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/lfs.png deleted file mode 100644 index 326b6596..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/lfs.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/linux.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/linux.png deleted file mode 100644 index 326b6596..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/linux.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/linuxmint.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/linuxmint.png deleted file mode 100644 index 7d9da816..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/linuxmint.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/lubuntu.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/lubuntu.png deleted file mode 100644 index 057c8e25..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/lubuntu.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/macosx.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/macosx.png deleted file mode 100644 index ea03e779..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/macosx.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/mageia.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/mageia.png deleted file mode 100644 index 79afa761..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/mageia.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/manjaro.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/manjaro.png deleted file mode 100644 index 611a6fbc..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/manjaro.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/mate.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/mate.png deleted file mode 100644 index b2fc22aa..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/mate.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/memtest.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/memtest.png deleted file mode 100644 index 1621ee7f..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/memtest.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/mx-linux.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/mx-linux.png deleted file mode 100644 index 49f11336..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/mx-linux.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/neon.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/neon.png deleted file mode 100644 index e41906e8..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/neon.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/opensuse.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/opensuse.png deleted file mode 100644 index d844fd5a..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/opensuse.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/parrot.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/parrot.png deleted file mode 100644 index 3333de91..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/parrot.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/pop-os.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/pop-os.png deleted file mode 100644 index 014d9f32..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/pop-os.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/pop.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/pop.png deleted file mode 100644 index 014d9f32..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/pop.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/recovery.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/recovery.png deleted file mode 100644 index 7b69b142..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/recovery.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/regolith.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/regolith.png deleted file mode 100644 index 5ece07ba..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/regolith.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/restart.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/restart.png deleted file mode 100644 index 97153021..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/restart.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/rocky.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/rocky.png deleted file mode 100644 index be144f6d..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/rocky.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/shutdown.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/shutdown.png deleted file mode 100644 index fc9cf16b..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/shutdown.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/siduction.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/siduction.png deleted file mode 100644 index d16549bc..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/siduction.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/slackware.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/slackware.png deleted file mode 100644 index 4c31a3f5..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/slackware.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/solus.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/solus.png deleted file mode 100644 index 338718b3..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/solus.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/steamos.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/steamos.png deleted file mode 100644 index df28bccc..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/steamos.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/type.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/type.png deleted file mode 100644 index 5c48476d..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/type.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/tz.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/tz.png deleted file mode 100644 index 220b29b1..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/tz.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/ubuntu.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/ubuntu.png deleted file mode 100644 index 352fbe08..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/ubuntu.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/unknown.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/unknown.png deleted file mode 100644 index 326b6596..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/unknown.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/unset.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/unset.png deleted file mode 100644 index 15e3d3cb..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/unset.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/ventoy.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/ventoy.png deleted file mode 100644 index 7abdc6c4..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/ventoy.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/void.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/void.png deleted file mode 100644 index 01cc2f3a..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/void.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/windows.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/windows.png deleted file mode 100644 index d5c7cc34..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/windows.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/windows11.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/windows11.png deleted file mode 100644 index fe97d9f7..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/windows11.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/xero.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/xero.png deleted file mode 100644 index 2221c73d..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/xero.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/xerolinux.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/xerolinux.png deleted file mode 100644 index 2221c73d..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/xerolinux.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/xubuntu.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/xubuntu.png deleted file mode 100644 index f43abc7b..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/xubuntu.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/zorin.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/zorin.png deleted file mode 100644 index c1506c44..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/zorin.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/select_c.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/select_c.png deleted file mode 100644 index b1f8d580..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/select_c.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/select_e.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/select_e.png deleted file mode 100644 index 93323686..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/select_e.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/select_w.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/select_w.png deleted file mode 100644 index 28f6424e..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/select_w.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_c.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_c.png deleted file mode 100644 index d0dd52a2..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_c.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_e.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_e.png deleted file mode 100644 index 394cbe4f..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_e.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_n.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_n.png deleted file mode 100644 index 476f8bc6..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_n.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_ne.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_ne.png deleted file mode 100644 index 9e26959b..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_ne.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_nw.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_nw.png deleted file mode 100644 index 5c3cba87..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_nw.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_s.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_s.png deleted file mode 100644 index 85a8901d..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_s.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_se.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_se.png deleted file mode 100644 index d8627ee5..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_se.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_sw.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_sw.png deleted file mode 100644 index 67c600c8..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_sw.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_w.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_w.png deleted file mode 100644 index d066e2db..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_w.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminus-12.pf2 b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminus-12.pf2 deleted file mode 100644 index 60920353..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminus-12.pf2 and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminus-14.pf2 b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminus-14.pf2 deleted file mode 100644 index 8ab8bd10..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminus-14.pf2 and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminus-16.pf2 b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminus-16.pf2 deleted file mode 100644 index 6e6b25d3..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminus-16.pf2 and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminus-18.pf2 b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminus-18.pf2 deleted file mode 100644 index 129cef14..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminus-18.pf2 and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/theme.txt b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/theme.txt deleted file mode 100644 index 3f26eea5..00000000 --- a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/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-ubuntu-64/bootloaders/boot/grub/live-theme/ubuntu_regular_17.pf2 b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/ubuntu_regular_17.pf2 deleted file mode 100644 index 9405954e..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/ubuntu_regular_17.pf2 and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/ubuntu_regular_20.pf2 b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/ubuntu_regular_20.pf2 deleted file mode 100644 index 3d903bae..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/ubuntu_regular_20.pf2 and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/loopback.cfg b/my-distro-ubuntu-64/bootloaders/boot/grub/loopback.cfg deleted file mode 100644 index b8e3b214..00000000 --- a/my-distro-ubuntu-64/bootloaders/boot/grub/loopback.cfg +++ /dev/null @@ -1 +0,0 @@ -source /boot/grub/grub.cfg \ No newline at end of file diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/splash.png b/my-distro-ubuntu-64/bootloaders/boot/grub/splash.png deleted file mode 100644 index cc4e08f1..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/boot/grub/splash.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/boot/grub/theme.cfg b/my-distro-ubuntu-64/bootloaders/boot/grub/theme.cfg deleted file mode 100644 index 56e4c18f..00000000 --- a/my-distro-ubuntu-64/bootloaders/boot/grub/theme.cfg +++ /dev/null @@ -1,13 +0,0 @@ -set color_normal=light-gray/black -set color_highlight=white/dark-gray - -if [ -e /isolinux/splash.png ]; then - # binary_syslinux modifies the theme file to point to the correct - # background picture - set theme=/boot/grub/live-theme/theme.txt -elif [ -e /boot/grub/splash.png ]; then - set theme=/boot/grub/live-theme/theme.txt -else - set menu_color_normal=white/red - set menu_color_highlight=white/red -fi diff --git a/my-distro-ubuntu-64/bootloaders/isolinux/chain.c32 b/my-distro-ubuntu-64/bootloaders/isolinux/chain.c32 deleted file mode 100644 index a9d6e0ea..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/isolinux/chain.c32 and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/isolinux/isolinux.cfg b/my-distro-ubuntu-64/bootloaders/isolinux/isolinux.cfg deleted file mode 100644 index e5d0290d..00000000 --- a/my-distro-ubuntu-64/bootloaders/isolinux/isolinux.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# D-I config version 2.0 -# search path for the c32 support libraries (libcom32, libutil etc.) -path -include menu.cfg -default vesamenu.c32 -prompt 0 -timeout 0 diff --git a/my-distro-ubuntu-64/bootloaders/isolinux/live.cfg.in b/my-distro-ubuntu-64/bootloaders/isolinux/live.cfg.in deleted file mode 100644 index 97ceb92a..00000000 --- a/my-distro-ubuntu-64/bootloaders/isolinux/live.cfg.in +++ /dev/null @@ -1,12 +0,0 @@ -label live-@FLAVOUR@ - menu label ^Live (@FLAVOUR@) - menu default - linux @LINUX@ - initrd @INITRD@ - append @APPEND_LIVE@ - -label live-@FLAVOUR@-failsafe - menu label ^Live (@FLAVOUR@ failsafe) - linux @LINUX@ - initrd @INITRD@ - append @APPEND_LIVE_FAILSAFE@ diff --git a/my-distro-ubuntu-64/bootloaders/isolinux/menu.cfg b/my-distro-ubuntu-64/bootloaders/isolinux/menu.cfg deleted file mode 100644 index 72845759..00000000 --- a/my-distro-ubuntu-64/bootloaders/isolinux/menu.cfg +++ /dev/null @@ -1,61 +0,0 @@ -INCLUDE stdmenu.cfg -MENU title Main Menu -DEFAULT My-distro Live -LABEL My-distro Live - SAY "Booting My-distro Live..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores - -LABEL My-distro live failsafe - menu label My-distro Live failsafe - kernel /live/vmlinuz - append initrd=/live/initrd.img boot=live config noapic noapm nodma nomce nolapic pci=nomsi nomodeset radeon.modeset=0 nouveau.modeset=0 nosmp vga=normal autologin - -LABEL hd - menu label Boot the first hard disk - COM32 chain.c32 - APPEND hd0 - -MENU begin advanced -MENU title My-distro Live with Localisation Support -LABEL Portuguese (pt) - SAY "Booting Portuguese (pt)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=pt_PT.UTF-8 username=user hostname=My-distro keyboard-layouts=pt quiet splash - -LABEL Portuguese (Brazil) (pt_BR) - SAY "Booting Portuguese (Brazil) (pt_BR)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=pt_BR.UTF-8 username=user hostname=My-distro keyboard-layouts=br quiet splash - -LABEL English (en) - SAY "Booting English (en)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=en_US.UTF-8 username=user hostname=My-distro keyboard-layouts=en quiet splash - -LABEL French (fr) - SAY "Booting French (fr)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=fr_FR.UTF-8 username=user hostname=My-distro keyboard-layouts=fr quiet splash - -LABEL German (de) - SAY "Booting German (de)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=de_DE.UTF-8 username=user hostname=My-distro keyboard-layouts=de quiet splash - -LABEL Italian (it) - SAY "Booting Italian (it)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=it_IT.UTF-8 username=user hostname=My-distro keyboard-layouts=it quiet splash - -LABEL Spanish (es) - SAY "Booting Spanish (es)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=es_ES.UTF-8 username=user hostname=My-distro keyboard-layouts=es quiet splash - - LABEL mainmenu - MENU label Back - MENU exit - MENU end - -INCLUDE utilities.cfg diff --git a/my-distro-ubuntu-64/bootloaders/isolinux/splash.png b/my-distro-ubuntu-64/bootloaders/isolinux/splash.png deleted file mode 100644 index cc4e08f1..00000000 Binary files a/my-distro-ubuntu-64/bootloaders/isolinux/splash.png and /dev/null differ diff --git a/my-distro-ubuntu-64/bootloaders/isolinux/stdmenu.cfg b/my-distro-ubuntu-64/bootloaders/isolinux/stdmenu.cfg deleted file mode 100644 index 39134698..00000000 --- a/my-distro-ubuntu-64/bootloaders/isolinux/stdmenu.cfg +++ /dev/null @@ -1,19 +0,0 @@ -menu background splash.png -menu color title * #FFFFFFFF * -menu color border * #00000000 #00000000 none -menu color sel * #ffffffff #76a1d0ff * -menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff * -menu color tabmsg * #ffffffff #00000000 * -menu color help 37;40 #ffdddd00 #00000000 none -# XXX When adjusting vshift, take care that rows is set to a small -# enough value so any possible menu will fit on the screen, -# rather than falling off the bottom. -menu vshift 8 -menu rows 8 -# The help line must be at least one line from the bottom. -menu helpmsgrow 14 -# The command line must be at least one line from the help line. -menu cmdlinerow 16 -menu timeoutrow 16 -menu tabmsgrow 18 -menu tabmsg Press ENTER to boot or TAB to edit a menu entry diff --git a/my-distro-ubuntu-64/bootloaders/isolinux/utilities.cfg b/my-distro-ubuntu-64/bootloaders/isolinux/utilities.cfg deleted file mode 100644 index d600a4c7..00000000 --- a/my-distro-ubuntu-64/bootloaders/isolinux/utilities.cfg +++ /dev/null @@ -1,4 +0,0 @@ -label hdt - menu label ^Hardware Detection Tool (HDT) - com32 hdt.c32 - diff --git a/my-distro-ubuntu-64/build.sh b/my-distro-ubuntu-64/build.sh deleted file mode 100755 index 20a9f11c..00000000 --- a/my-distro-ubuntu-64/build.sh +++ /dev/null @@ -1,280 +0,0 @@ -#!/bin/bash - -################################################################################ -# Title: build.sh -# Description: Script to build My-distro ISO image -# Author: manuel rosa -# Date: Outubro 29, 2023 -# License: GPL-3.0-or-later -################################################################################ - -PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" - -# Set the working folder variable -build="$(pwd)" - - -# Create the build folder, move into it removing stale mountpoints and files there. -[ -e build ] && [ ! -d build ] && rm -f build || [ ! -e build ] && mkdir build -cd build -umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null -for i in * .build ; do [ $i = cache ] && continue || rm -rf $i ; done - - -# Set of the structure to be used for the ISO and Live system. -# See /usr/lib/live/build/config for a full list of examples. -# Up above is the manual description of what options I used so far. - -lb config noauto \ - --binary-images iso-hybrid \ - --mode ubuntu \ - --architectures amd64 \ - --linux-flavours generic \ - --distribution jammy \ - --archive-areas "main multiverse restricted universe" \ - --mirror-bootstrap http://archive.ubuntu.com/ubuntu \ - --parent-mirror-bootstrap http://archive.ubuntu.com/ubuntu \ - --parent-mirror-chroot http://archive.ubuntu.com/ubuntu \ - --parent-mirror-chroot-security http://security.ubuntu.com/ubuntu \ - --parent-mirror-binary http://archive.ubuntu.com/ubuntu \ - --parent-mirror-binary-security http://security.ubuntu.com/ubuntu \ - --mirror-chroot http://archive.ubuntu.com/ubuntu \ - --mirror-chroot-security http://security.ubuntu.com/ubuntu \ - --debian-installer live \ - --debian-installer-distribution jammy \ - --debian-installer-gui true \ - --updates true \ - --security true \ - --cache true \ - --apt-recommends true \ - --firmware-binary true \ - --firmware-chroot true \ - --iso-application "My-distro" \ - --win32-loader false \ - --iso-volume "My-distro-amd64" \ - --iso-publisher "Manuel rosa" \ - --image-name "My-distro" \ - --win32-loader false \ - --checksums sha512 \ - --zsync false \ - "${@}" - - -# Install the Xfce Desktop -mkdir -p $build/build/config/package-lists -echo xfce4 xfce4-goodies > $build/build/config/package-lists/desktop.list.chroot - -# Install software -echo "# Install software to the squashfs for calamares to unpack to the OS. -linux-headers-generic -locales -language-selector-gnome -#update-manager -gnome-packagekit -adwaita-icon-theme-full -dkms -dbus-x11 -ntp -xorg -xserver-xorg -xserver-xorg-input-synaptics -xserver-xorg-input-all -xserver-xorg-video-vmware -xserver-xorg-video-all -ffmpeg -sox -twolame -lame -faad -gstreamer1.0-plugins-good -gstreamer1.0-plugins-ugly -gstreamer1.0-plugins-bad -gstreamer1.0-pulseaudio -unrar -rar -p7zip-full -p7zip-rar -zip -unzip -pulseaudio -pavucontrol -alsa-utils -aptitude -synaptic -gparted -apt-config-auto-update -libelf-dev -htop -package-update-indicator -gvfs-backends -samba -network-manager -network-manager-gnome -network-manager-pptp-gnome -bluez -blueman -gufw -gtk2-engines -plymouth -plymouth-themes -cups -system-config-printer -lightdm -lightdm-gtk-greeter -lightdm-gtk-greeter-settings -lightdm-autologin-greeter -menulibre -mugshot -xscreensaver -xscreensaver-data -xscreensaver-data-extra -xscreensaver-gl -xscreensaver-gl-extra -gnome-system-tools -gnome-disk-utility -gnome-calculator -neofetch -accountsservice -catfish -fuseiso -timeshift -gnome-software -gnome-software-plugin-flatpak -gnome-software-plugin-snap -software-properties-gtk -fwupd -bleachbit -dconf-editor -gimp -gimp-data-extras -evince -xsane -nano -language-pack-de -language-pack-en -language-pack-fr -language-pack-pt -language-pack-it -language-pack-gnome-de -language-pack-gnome-es -language-pack-gnome-fr -language-pack-gnome-pt -language-pack-gnome-it -transmission-gtk -thunderbird -thunderbird-locale-pt-pt -thunderbird-locale-pt-br -thunderbird-locale-de -thunderbird-locale-en -thunderbird-locale-en-us -thunderbird-locale-es -libreoffice -libreoffice-gtk -libreoffice-gtk3 -libreoffice-l10n-pt -libreoffice-l10n-pt-br -libreoffice-l10n-de -libreoffice-l10n-en-gb -libreoffice-l10n-es -printer-driver-cups-pdf -gnome-2048 -gnome-chess -gnome-mahjongg -gnome-sudoku -guvcview -vlc -qt5-style-plugins -qt5ct -gdebi -f2fs-tools -xfsprogs -xfsdump -tumbler -tumbler-plugins-extra -ffmpegthumbnailer -linux-firmware -xterm -grub-pc -spice-vdagent -console-setup - -" > $build/build/config/package-lists/packages.list.chroot - - -echo "# Installer packages to install the system to disk. -calamares -calamares-settings-debian - -" > $build/build/config/package-lists/installer.list.chroot - -# Packages to be stored in /pool but not installed in the OS . -echo "# These packages are available to the installer, for offline use. -b43-fwcutter -bcmwl-kernel-source -iucode-tool -setserial -user-setup -efibootmgr -grub-efi -secureboot-db -grub-efi-amd64 -grub-efi-amd64-bin -grub-efi-amd64-signed -shim -shim-signed - -" > $build/build/config/package-lists/installer.list.binary - - -# Setup the chroot structure -mkdir -p $build/build/config/includes.binary -mkdir -p $build/build/config/hooks/live -mkdir -p $build/build/config/hooks/normal -mkdir -p $build/build/config/bootloaders -mkdir -p $build/build/config/packages.chroot -mkdir -p $build/build/config/includes.chroot/etc -mkdir -p $build/build/config/includes.chroot/usr/share/applications -mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds -mkdir -p $build/build/config/includes.chroot/etc/calamares -mkdir -p $build/build/config/includes.chroot/usr/share/icons -mkdir -p $build/build/config/includes.chroot/usr/share/themes -mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d -mkdir -p $build/build/config/includes.chroot/usr/sbin -mkdir -p $build/build/config/includes.chroot/etc/lightdm -mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps -mkdir -p $build/build/config/includes.chroot/usr/share/plymouth -mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base -mkdir -p $build/build/config/includes.chroot/etc/default -mkdir -p $build/build/config/includes.chroot/boot/grub/themes -mkdir -p $build/build/config/includes.installer/usr/lib/finish-install.d -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 -cp $build/applications/* $build/build/config/includes.chroot/usr/share/applications -cp $build/hooks/live/* $build/build/config/hooks/live -cp $build/hooks/normal/* $build/build/config/hooks/normal -cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps -cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin -cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin -cp $build/grub/grub $build/build/config/includes.chroot/etc/default -cp $build/scripts/* $build/build/config/includes.installer/usr/lib/finish-install.d -cp $build/deb-installer/preseed/* $build/build/config/includes.installer - -cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm -cp -r $build/bootloaders/* $build/build/config/includes.binary -cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds -cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares -cp -r $build/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/* $build/build/config/includes.chroot/boot/grub/themes -cp -r $build/deb-installer/graphics $build/build/config/includes.installer/usr/share -cp -r $build/deb-installer/themes $build/build/config/includes.installer/usr/share - - - -# Build the ISO # -lb build #--debug --verbose - diff --git a/my-distro-ubuntu-64/calamares/branding/my-distro/1.png b/my-distro-ubuntu-64/calamares/branding/my-distro/1.png deleted file mode 100644 index c1bb4f94..00000000 Binary files a/my-distro-ubuntu-64/calamares/branding/my-distro/1.png and /dev/null differ diff --git a/my-distro-ubuntu-64/calamares/branding/my-distro/2.png b/my-distro-ubuntu-64/calamares/branding/my-distro/2.png deleted file mode 100644 index f882def0..00000000 Binary files a/my-distro-ubuntu-64/calamares/branding/my-distro/2.png and /dev/null differ diff --git a/my-distro-ubuntu-64/calamares/branding/my-distro/3.png b/my-distro-ubuntu-64/calamares/branding/my-distro/3.png deleted file mode 100644 index 50f0afe1..00000000 Binary files a/my-distro-ubuntu-64/calamares/branding/my-distro/3.png and /dev/null differ diff --git a/my-distro-ubuntu-64/calamares/branding/my-distro/4.png b/my-distro-ubuntu-64/calamares/branding/my-distro/4.png deleted file mode 100644 index 0eb7c7e7..00000000 Binary files a/my-distro-ubuntu-64/calamares/branding/my-distro/4.png and /dev/null differ diff --git a/my-distro-ubuntu-64/calamares/branding/my-distro/5.png b/my-distro-ubuntu-64/calamares/branding/my-distro/5.png deleted file mode 100644 index b4cdc7f0..00000000 Binary files a/my-distro-ubuntu-64/calamares/branding/my-distro/5.png and /dev/null differ diff --git a/my-distro-ubuntu-64/calamares/branding/my-distro/6.png b/my-distro-ubuntu-64/calamares/branding/my-distro/6.png deleted file mode 100644 index f1ed9527..00000000 Binary files a/my-distro-ubuntu-64/calamares/branding/my-distro/6.png and /dev/null differ diff --git a/my-distro-ubuntu-64/calamares/branding/my-distro/branding.desc b/my-distro-ubuntu-64/calamares/branding/my-distro/branding.desc deleted file mode 100644 index 2995b506..00000000 --- a/my-distro-ubuntu-64/calamares/branding/my-distro/branding.desc +++ /dev/null @@ -1,28 +0,0 @@ ---- -componentName: my-distro -welcomeStyleCalamares: true - -strings: - productName: My-distro GNU/Linux - shortProductName: My-distro GNU/Linux - version: 1.0 - shortVersion: 1.0 - versionedName: My-distro GNU/Linux - shortVersionedName: My-distro GNU/Linux 1.0 - bootloaderEntryName: ubuntu - - -images: - productLogo: "debian-logo.png" - productIcon: "debian-logo.png" - productWelcome: "languages.png" - -slideshow: "show.qml" - -style: - sidebarBackground: "#303030" - sidebarText: "#FFFFFF" - sidebarTextSelect: "#4d7079" - sidebarTextSelect: "#292F34" - -slideshowAPI: 2 diff --git a/my-distro-ubuntu-64/calamares/branding/my-distro/debian-logo.png b/my-distro-ubuntu-64/calamares/branding/my-distro/debian-logo.png deleted file mode 100644 index cee14198..00000000 Binary files a/my-distro-ubuntu-64/calamares/branding/my-distro/debian-logo.png and /dev/null differ diff --git a/my-distro-ubuntu-64/calamares/branding/my-distro/languages.png b/my-distro-ubuntu-64/calamares/branding/my-distro/languages.png deleted file mode 100644 index 5119ab79..00000000 Binary files a/my-distro-ubuntu-64/calamares/branding/my-distro/languages.png and /dev/null differ diff --git a/my-distro-ubuntu-64/calamares/branding/my-distro/show.qml b/my-distro-ubuntu-64/calamares/branding/my-distro/show.qml deleted file mode 100644 index 6752f346..00000000 --- a/my-distro-ubuntu-64/calamares/branding/my-distro/show.qml +++ /dev/null @@ -1,177 +0,0 @@ -/* === This file is part of Calamares - === - * - * Copyright 2015, Teo Mrnjavac - * - * Calamares is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Calamares is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Calamares. If not, see . - */ - -import QtQuick 2.0; -import calamares.slideshow 1.0; - -Presentation -{ - id: presentation - - Timer { - id: advanceTimer - interval: 15000 - running: false - repeat: true - onTriggered: presentation.goToNextSlide() - } - - Slide { - anchors.fill: parent - - Image { - id: background - source: "1.png" - anchors.fill: parent - - Text { - anchors.centerIn: parent - anchors.verticalCenterOffset: 0 - anchors.horizontalCenterOffset: -125 - font.pixelSize: parent.width *.015 - color: 'white' - text: qsTr(""+ - ""+ - ""+ - ""+ - "") - wrapMode: Text.WordWrap - width: 500 - horizontalAlignment: Text.AlignLeft - } - } - } - - Slide { - anchors.fill: parent - - Image { - id: background1 - source: "2.png" - anchors.fill: parent - - Text { - anchors.centerIn: parent - anchors.verticalCenterOffset: 0 - anchors.horizontalCenterOffset: 250 - font.pixelSize: parent.width *.015 - color: 'white' - text: qsTr(""+ - ""+ - ""+ - "") - wrapMode: Text.WordWrap - width: 450 - horizontalAlignment: Text.AlignLeft - } - } - } - - Slide { - anchors.fill: parent - - Image { - id: background2 - source: "3.png" - anchors.fill: parent - - Text { - anchors.centerIn: parent - anchors.verticalCenterOffset: 0 - anchors.horizontalCenterOffset: -100 - font.pixelSize: parent.width *.015 - color: 'white' - text: qsTr(""+ - ">") - wrapMode: Text.WordWrap - width: 450 - horizontalAlignment: Text.AlignLeft - } - } - } - - Slide { - anchors.fill: parent - - Image { - id: background3 - source: "4.png" - anchors.fill: parent - - Text { - anchors.centerIn: parent - anchors.verticalCenterOffset: 0 - anchors.horizontalCenterOffset: 250 - font.pixelSize: parent.width *.015 - color: 'white' - text: qsTr(""+ - ""+ - "") - wrapMode: Text.WordWrap - width: 450 - horizontalAlignment: Text.AlignLeft - } - } - } - - Slide { - anchors.fill: parent - - Image { - id: background4 - source: "5.png" - anchors.fill: parent - - Text { - anchors.centerIn: parent - anchors.verticalCenterOffset: 0 - anchors.horizontalCenterOffset: -200 - font.pixelSize: parent.width *.015 - color: 'white' - text: qsTr("") - wrapMode: Text.WordWrap - width: 450 - horizontalAlignment: Text.Center - } - } - } - - Slide { - anchors.fill: parent - - Image { - id: background5 - source: "6.png" - anchors.fill: parent - - Text { - anchors.centerIn: parent - anchors.verticalCenterOffset: 0 - anchors.horizontalCenterOffset: 250 - font.pixelSize: parent.width *.015 - color: 'white' - text: qsTr("") - wrapMode: Text.WordWrap - width: 450 - horizontalAlignment: Text.Center - } - } - } - - Component.onCompleted: advanceTimer.running = true -} diff --git a/my-distro-ubuntu-64/calamares/modules/bootloader.conf b/my-distro-ubuntu-64/calamares/modules/bootloader.conf deleted file mode 100644 index c6d66e52..00000000 --- a/my-distro-ubuntu-64/calamares/modules/bootloader.conf +++ /dev/null @@ -1,54 +0,0 @@ -# Bootloader configuration. The bootloader is installed to allow -# the system to start (and pick one of the installed operating -# systems to run). ---- -# Define which bootloader you want to use for EFI installations -# Possible options are 'grub', 'sb-shim' and 'systemd-boot'. -efiBootLoader: "grub" - -# systemd-boot configuration files settings, set kernel and initramfs file names -# and amount of time before default selection boots -kernel: "/vmlinuz-linux" -img: "/initramfs-linux.img" -fallback: "/initramfs-linux-fallback.img" -timeout: "10" - -# Optionally set the menu entry name and kernel name to use in systemd-boot. -# If not specified here, these settings will be taken from branding.desc. -# -# bootloaderEntryName: "Generic GNU/Linux" -# kernelLine: ", with Stable-Kernel" -# fallbackKernelLine: ", with Stable-Kernel (fallback initramfs)" - -# GRUB 2 binary names and boot directory -# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names. -# These names are also used when using sb-shim, since that needs some -# GRUB functionality (notably grub-probe) to work. As needed, you may use -# complete paths like `/usr/bin/efibootmgr` for the executables. -# -grubInstall: "grub-install" -grubMkconfig: "grub-mkconfig" -grubCfg: "/boot/grub/grub.cfg" -grubProbe: "grub-probe" -efiBootMgr: "efibootmgr" - -# Optionally set the bootloader ID to use for EFI. This is passed to -# grub-install --bootloader-id. -# -# If not set here, the value from bootloaderEntryName from branding.desc -# is used, with problematic characters (space and slash) replaced. -# -# The ID is also used as a directory name within the EFI environment, -# and the bootloader is copied from /boot/efi/EFI// . When -# setting the option here, keep in mind that the name is sanitized -# (problematic characters, see above, are replaced). -# -efiBootloaderId: "ubuntu" - -# Optionally install a copy of the GRUB EFI bootloader as the EFI -# fallback loader (either bootia32.efi or bootx64.efi depending on -# the system). This may be needed on certain systems (Intel DH87MC -# seems to be the only one). If you set this to false, take care -# to add another module to optionally install the fallback on those -# boards that need it. -installEFIFallback: false diff --git a/my-distro-ubuntu-64/calamares/modules/displaymanager.conf b/my-distro-ubuntu-64/calamares/modules/displaymanager.conf deleted file mode 100644 index 8f8e9c70..00000000 --- a/my-distro-ubuntu-64/calamares/modules/displaymanager.conf +++ /dev/null @@ -1,28 +0,0 @@ -# Configure one or more display managers (e.g. SDDM) -# with a "best effort" approach. ---- -#The DM module attempts to set up all the DMs found in this list, in that precise order. -#It also sets up autologin, if the feature is enabled in globalstorage. -#The displaymanagers list can also be set in globalstorage, and in that case it overrides anything set up here. -displaymanagers: - - slim - - sddm - - lightdm - - gdm - - mdm - - lxdm - - kdm - -#Enable the following settings to force a desktop environment in your displaymanager configuration file: -#defaultDesktopEnvironment: -# executable: "startkde" -# desktopFile: "plasma" - -#If true, try to ensure that the user, group, /var directory etc. for the -#display manager are set up correctly. This is normally done by the distribution -#packages, and best left to them. Therefore, it is disabled by default. -basicSetup: false - -#If true, setup autologin for openSUSE. This only makes sense on openSUSE -#derivatives or other systems where /etc/sysconfig/displaymanager exists. -sysconfigSetup: false diff --git a/my-distro-ubuntu-64/calamares/modules/finished.conf b/my-distro-ubuntu-64/calamares/modules/finished.conf deleted file mode 100644 index 188edf09..00000000 --- a/my-distro-ubuntu-64/calamares/modules/finished.conf +++ /dev/null @@ -1,4 +0,0 @@ ---- -restartNowEnabled: true -restartNowChecked: true -restartNowCommand: "systemctl -i reboot" diff --git a/my-distro-ubuntu-64/calamares/modules/fstab.conf b/my-distro-ubuntu-64/calamares/modules/fstab.conf deleted file mode 100644 index 29907170..00000000 --- a/my-distro-ubuntu-64/calamares/modules/fstab.conf +++ /dev/null @@ -1,11 +0,0 @@ ---- -mountOptions: - default: defaults,noatime - btrfs: defaults,noatime,space_cache,autodefrag -ssdExtraMountOptions: - ext4: discard - jfs: discard - xfs: discard - swap: discard - btrfs: discard,compress=lzo -crypttabOptions: luks,keyscript=/bin/cat diff --git a/my-distro-ubuntu-64/calamares/modules/locale.conf b/my-distro-ubuntu-64/calamares/modules/locale.conf deleted file mode 100644 index f5e9096b..00000000 --- a/my-distro-ubuntu-64/calamares/modules/locale.conf +++ /dev/null @@ -1,6 +0,0 @@ -localeGenPath: "/etc/locale.gen" -geoip: - style: "json" - url: "https://ipapi.co/json" - selector: "timezone" - diff --git a/my-distro-ubuntu-64/calamares/modules/luksopenswaphookcfg.conf b/my-distro-ubuntu-64/calamares/modules/luksopenswaphookcfg.conf deleted file mode 100644 index f5610cd7..00000000 --- a/my-distro-ubuntu-64/calamares/modules/luksopenswaphookcfg.conf +++ /dev/null @@ -1,4 +0,0 @@ -# Writes an openswap configuration with LUKS settings to the given path ---- -# Path of the configuration file to write (in the target system) -configFilePath: /etc/openswap.conf diff --git a/my-distro-ubuntu-64/calamares/modules/machineid.conf b/my-distro-ubuntu-64/calamares/modules/machineid.conf deleted file mode 100644 index fa3527fc..00000000 --- a/my-distro-ubuntu-64/calamares/modules/machineid.conf +++ /dev/null @@ -1,15 +0,0 @@ ---- -# Whether to create /etc/machine-id for systemd. -systemd: true -# Whether to create /var/lib/dbus/machine-id for D-Bus. -dbus: true -# Whether /var/lib/dbus/machine-id should be a symlink to /etc/machine-id -# (ignored if dbus is false, or if there is no /etc/machine-id to point to). -symlink: true -# Whether to copy entropy from the host -entropy-copy: true -# Which files to write (paths in the target) -entropy-files: - - /var/lib/urandom/random-seed - - /var/lib/systemd/random-seed - diff --git a/my-distro-ubuntu-64/calamares/modules/mount.conf b/my-distro-ubuntu-64/calamares/modules/mount.conf deleted file mode 100644 index bb28eed6..00000000 --- a/my-distro-ubuntu-64/calamares/modules/mount.conf +++ /dev/null @@ -1,36 +0,0 @@ -# Mount filesystems in the target (generally, before treating the -# target as a usable chroot / "live" system). Filesystems are -# automatically mounted from the partitioning module. Filesystems -# listed here are **extra**. The filesystems listed in *extraMounts* -# are mounted in all target systems. The filesystems listed in -# *extraMountsEfi* are mounted in the target system **only** if -# the host machine uses UEFI. ---- -# Extra filesystems to mount. The key's value is a list of entries; each -# entry has four keys: -# - device The device node to mount -# - fs The filesystem type to use -# - mountPoint Where to mount the filesystem -# - options (optional) Extra options to pass to mount(8) -# -extraMounts: - - device: proc - fs: proc - mountPoint: /proc - - device: sys - fs: sysfs - mountPoint: /sys - - device: /dev - mountPoint: /dev - options: bind - - device: tmpfs - fs: tmpfs - mountPoint: /run - - device: /run/udev - mountPoint: /run/udev - options: bind - -extraMountsEfi: - - device: efivarfs - fs: efivarfs - mountPoint: /sys/firmware/efi/efivars diff --git a/my-distro-ubuntu-64/calamares/modules/packages.conf b/my-distro-ubuntu-64/calamares/modules/packages.conf deleted file mode 100644 index f1278985..00000000 --- a/my-distro-ubuntu-64/calamares/modules/packages.conf +++ /dev/null @@ -1,15 +0,0 @@ -update_db: true -backend: apt -operations: - - remove: - - "^live-*" - - calamares-settings-lubuntu - - calamares - - hunspell-en-us - - zram-config - - cifs-utils - - try_install: - - language-pack-$LOCALE - - hunspell-$LOCALE - - libreoffice-help-$LOCALE - - libreoffice-l10n-$LOCALE diff --git a/my-distro-ubuntu-64/calamares/modules/partition.conf b/my-distro-ubuntu-64/calamares/modules/partition.conf deleted file mode 100644 index a0423714..00000000 --- a/my-distro-ubuntu-64/calamares/modules/partition.conf +++ /dev/null @@ -1,12 +0,0 @@ -efiSystemPartition: "/boot/efi" -userSwapChoices: - - none # Create no swap, use no swap - - small # Up to 4GB - - suspend # At least main memory size - - file # To swap file instead of partition -alwaysShowPartitionLabels: true -initialPartitioningChoice: erase -initialSwapChoice: none -defaultFileSystemType: "ext4" -availableFileSystemTypes: ["ext4","btrfs", "f2fs","xfs"] - diff --git a/my-distro-ubuntu-64/calamares/modules/unpackfs.conf b/my-distro-ubuntu-64/calamares/modules/unpackfs.conf deleted file mode 100644 index 833a68bb..00000000 --- a/my-distro-ubuntu-64/calamares/modules/unpackfs.conf +++ /dev/null @@ -1,5 +0,0 @@ ---- -unpack: - - source: "/run/live/medium/live/filesystem.squashfs" - sourcefs: "squashfs" - destination: "" diff --git a/my-distro-ubuntu-64/calamares/modules/users.conf b/my-distro-ubuntu-64/calamares/modules/users.conf deleted file mode 100644 index a0ba0821..00000000 --- a/my-distro-ubuntu-64/calamares/modules/users.conf +++ /dev/null @@ -1,18 +0,0 @@ ---- -userGroup: users -defaultGroups: - - cdrom - - floppy - - sudo - - audio - - dip - - video - - plugdev - - netdev - - lpadmin - - scanner - - bluetooth - - sambashare -autologinGroup: autologin -sudoersGroup: sudo -setRootPassword: true diff --git a/my-distro-ubuntu-64/calamares/modules/welcome.conf b/my-distro-ubuntu-64/calamares/modules/welcome.conf deleted file mode 100644 index be58da0f..00000000 --- a/my-distro-ubuntu-64/calamares/modules/welcome.conf +++ /dev/null @@ -1,17 +0,0 @@ ---- -showSupportUrl: false -showKnownIssuesUrl: false -showReleaseNotesUrl: false - -requirements: - requiredStorage: 10 - requiredRam: 1.0 - check: - - storage - - ram - - power - - root - required: - - storage - - ram - - root diff --git a/my-distro-ubuntu-64/calamares/settings.conf b/my-distro-ubuntu-64/calamares/settings.conf deleted file mode 100644 index 3c96f0e8..00000000 --- a/my-distro-ubuntu-64/calamares/settings.conf +++ /dev/null @@ -1,125 +0,0 @@ -# Configuration file for Calamares -# Syntax is YAML 1.2 ---- - -# "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules -modules-search: [ local, /usr/lib/calamares/modules ] - -# If this is set to true, Calamares refers to itself as a "setup program" -# rather than an "installer". Defaults to the value of dont-chroot, but -# Calamares will complain if this is not explicitly set. -oem-setup: false - -# If this is set to true, the "Cancel" button will be disabled entirely. -# The button is also hidden from view. -# -# This can be useful if when e.g. Calamares is used as a post-install -# configuration tool and you require the user to go through all the -# configuration steps. -# -# Default is false, but Calamares will complain if this is not explicitly set. -# -# YAML: boolean. -disable-cancel: false - -# If this is set to true, the "Cancel" button will be disabled once -# you start the 'Installation', meaning there won't be a way to cancel -# the Installation until it has finished or installation has failed. -# -# Default is false, but Calamares will complain if this is not explicitly set. -# -# YAML: boolean. -disable-cancel-during-exec: false - -# If this is set to true, then once the end of the sequence has -# been reached, the quit (done) button is clicked automatically -# and Calamares will close. Default is false: the user will see -# that the end of installation has been reached, and that things are ok. -# -# -quit-at-end: false - -sequence: -# Phase 1 - prepare. -# View modules are shown as UI pages, jobs from job modules -# are executed immediately in the background. -# Jobs should be executed sparingly (if at all) in this phase. -- show: - - welcome - - locale - - keyboard - - partition - - users - - summary - -# Phase 2 - install. -# View modules are not shown. Only the view modules shown -# in the previous phase are allowed, their names should be -# added here as placeholders to specify the order in which -# view module jobs should be enqueued. Job modules are -# also allowed. -- exec: - - partition - - mount - - unpackfs - - sources-media - - machineid - - fstab - - locale - - keyboard - - localecfg - - users - - displaymanager - - networkcfg - - hwclock - - services-systemd - - bootloader-config - - grubcfg - - bootloader - - packages - - luksbootkeyfile - - plymouthcfg - - initramfscfg - - initramfs - - sources-media-unmount - - sources-final - - umount - -# Phase 3 - postinstall. -# View modules are shown as UI pages, jobs from job modules are -# executed immediately in the background. -# Jobs should be executed sparingly (if at all) in this phase. -- show: - - finished - -# A branding component is a directory, either in -# SHARE/calamares/branding or in /etc/calamares/branding -# (the latter takes precedence). The directory must contain a -# YAML file branding.desc which may reference additional resources -# (such as images) as paths relative to the current directory. -# Only the name of the branding component (directory) should be -# specified here, Calamares then takes care of finding it and -# loading the contents. -branding: my-distro - -# If this is set to true, Calamares will show an "Are you sure?" prompt right -# before each execution phase, i.e. at points of no return. If this is set to -# false, no prompt is shown. Default is false. -# -# YAML: boolean. -prompt-install: false - -# If this is set to true, Calamares will execute all target environment -# commands in the current environment, without chroot. This setting should -# only be used when setting up Calamares as a post-install configuration tool, -# as opposed to a full operating system installer. -# -# Some official Calamares modules are not expected to function with this -# setting. (e.g. partitioning seems like a bad idea, since that is expected to -# have been done already) -# -# Default is false (for a normal installer). -# -# YAML: boolean. -dont-chroot: false - diff --git a/my-distro-ubuntu-64/configs b/my-distro-ubuntu-64/configs deleted file mode 120000 index 271eaab3..00000000 --- a/my-distro-ubuntu-64/configs +++ /dev/null @@ -1 +0,0 @@ -../configs \ No newline at end of file diff --git a/my-distro-ubuntu-64/deb-installer b/my-distro-ubuntu-64/deb-installer deleted file mode 120000 index f9631f6b..00000000 --- a/my-distro-ubuntu-64/deb-installer +++ /dev/null @@ -1 +0,0 @@ -../deb-installer \ No newline at end of file diff --git a/my-distro-ubuntu-64/grub/grub b/my-distro-ubuntu-64/grub/grub deleted file mode 100755 index b3636885..00000000 --- a/my-distro-ubuntu-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-ubuntu-64/grub/themes/my-distro/background.png b/my-distro-ubuntu-64/grub/themes/my-distro/background.png deleted file mode 100644 index cc4e08f1..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/background.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/4MLinux.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/4MLinux.png deleted file mode 100644 index 1c6fe5e2..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/4MLinux.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/AlpineLinux.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/AlpineLinux.png deleted file mode 100644 index 6212a1fa..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/AlpineLinux.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/Manjaro.i686.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/Manjaro.i686.png deleted file mode 100644 index 611a6fbc..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/Manjaro.i686.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/Manjaro.x86_64.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/Manjaro.x86_64.png deleted file mode 100644 index 611a6fbc..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/Manjaro.x86_64.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/SystemRescueCD.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/SystemRescueCD.png deleted file mode 100644 index 7c41182f..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/SystemRescueCD.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/android.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/android.png deleted file mode 100644 index dad066f5..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/android.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/anonymous.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/anonymous.png deleted file mode 100644 index 7d165b67..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/anonymous.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/antergos.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/antergos.png deleted file mode 100644 index 32e3a3a3..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/antergos.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/arch.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/arch.png deleted file mode 100644 index f6cd8704..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/arch.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/archlinux.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/archlinux.png deleted file mode 100644 index f6cd8704..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/archlinux.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/arcolinux.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/arcolinux.png deleted file mode 100644 index c5e5e5ea..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/arcolinux.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/artix.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/artix.png deleted file mode 100644 index 0cbeb11c..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/artix.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/bedrock.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/bedrock.png deleted file mode 100644 index 58ff48a8..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/bedrock.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/cancel.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/cancel.png deleted file mode 100644 index fca2ac9d..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/cancel.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/centos.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/centos.png deleted file mode 100644 index 23fe2fa5..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/centos.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/chakra.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/chakra.png deleted file mode 100644 index 6f63a959..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/chakra.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/debian.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/debian.png deleted file mode 100644 index 20bea8c2..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/debian.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/deepin.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/deepin.png deleted file mode 100644 index 61c92fb4..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/deepin.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/devuan.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/devuan.png deleted file mode 100644 index ff654016..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/devuan.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/driver.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/driver.png deleted file mode 100644 index 1621ee7f..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/driver.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/edit.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/edit.png deleted file mode 100644 index 6a43bd99..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/edit.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/efi.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/efi.png deleted file mode 100644 index 4ecf3b98..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/efi.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/elementary.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/elementary.png deleted file mode 100644 index 2840354c..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/elementary.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/endeavouros.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/endeavouros.png deleted file mode 100644 index 6b1e530d..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/endeavouros.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/fedora.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/fedora.png deleted file mode 100644 index 926b56d1..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/fedora.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/find.efi.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/find.efi.png deleted file mode 100644 index 0e32321a..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/find.efi.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/find.none.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/find.none.png deleted file mode 100644 index 87d4d0ec..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/find.none.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/freebsd.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/freebsd.png deleted file mode 100644 index fb9408cf..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/freebsd.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/garuda.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/garuda.png deleted file mode 100644 index f699718a..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/garuda.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/gentoo.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/gentoo.png deleted file mode 100644 index bc0ed705..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/gentoo.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/gnu-linux.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/gnu-linux.png deleted file mode 100644 index 326b6596..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/gnu-linux.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/haiku.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/haiku.png deleted file mode 100644 index ce7f8182..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/haiku.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/help.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/help.png deleted file mode 100644 index d8b5a173..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/help.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/kali.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/kali.png deleted file mode 100644 index 900dc82e..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/kali.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/kaos.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/kaos.png deleted file mode 100644 index 9fd4e891..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/kaos.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/kbd.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/kbd.png deleted file mode 100644 index 6ace3ace..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/kbd.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/korora.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/korora.png deleted file mode 100644 index 456e8764..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/korora.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/kubuntu.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/kubuntu.png deleted file mode 100644 index 7a79ff32..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/kubuntu.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/lang.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/lang.png deleted file mode 100644 index 3c9c1d79..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/lang.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/lfs.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/lfs.png deleted file mode 100644 index 326b6596..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/lfs.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/linux.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/linux.png deleted file mode 100644 index 326b6596..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/linux.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/linuxmint.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/linuxmint.png deleted file mode 100644 index 7d9da816..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/linuxmint.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/lubuntu.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/lubuntu.png deleted file mode 100644 index 057c8e25..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/lubuntu.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/macosx.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/macosx.png deleted file mode 100644 index ea03e779..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/macosx.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/mageia.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/mageia.png deleted file mode 100644 index 79afa761..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/mageia.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/manjaro.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/manjaro.png deleted file mode 100644 index 611a6fbc..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/manjaro.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/mate.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/mate.png deleted file mode 100644 index b2fc22aa..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/mate.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/memtest.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/memtest.png deleted file mode 100644 index 1621ee7f..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/memtest.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/mx-linux.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/mx-linux.png deleted file mode 100644 index 49f11336..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/mx-linux.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/neon.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/neon.png deleted file mode 100644 index e41906e8..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/neon.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/opensuse.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/opensuse.png deleted file mode 100644 index d844fd5a..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/opensuse.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/parrot.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/parrot.png deleted file mode 100644 index 3333de91..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/parrot.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/pop-os.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/pop-os.png deleted file mode 100644 index 014d9f32..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/pop-os.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/pop.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/pop.png deleted file mode 100644 index 014d9f32..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/pop.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/recovery.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/recovery.png deleted file mode 100644 index 7b69b142..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/recovery.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/regolith.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/regolith.png deleted file mode 100644 index 5ece07ba..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/regolith.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/restart.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/restart.png deleted file mode 100644 index 97153021..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/restart.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/rocky.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/rocky.png deleted file mode 100644 index be144f6d..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/rocky.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/shutdown.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/shutdown.png deleted file mode 100644 index fc9cf16b..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/shutdown.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/siduction.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/siduction.png deleted file mode 100644 index d16549bc..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/siduction.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/slackware.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/slackware.png deleted file mode 100644 index 4c31a3f5..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/slackware.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/solus.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/solus.png deleted file mode 100644 index 338718b3..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/solus.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/steamos.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/steamos.png deleted file mode 100644 index df28bccc..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/steamos.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/type.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/type.png deleted file mode 100644 index 5c48476d..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/type.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/tz.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/tz.png deleted file mode 100644 index 220b29b1..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/tz.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/ubuntu.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/ubuntu.png deleted file mode 100644 index 352fbe08..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/ubuntu.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/unknown.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/unknown.png deleted file mode 100644 index 326b6596..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/unknown.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/unset.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/unset.png deleted file mode 100644 index 15e3d3cb..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/unset.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/ventoy.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/ventoy.png deleted file mode 100644 index 7abdc6c4..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/ventoy.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/void.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/void.png deleted file mode 100644 index 01cc2f3a..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/void.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/windows.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/windows.png deleted file mode 100644 index d5c7cc34..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/windows.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/windows11.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/windows11.png deleted file mode 100644 index fe97d9f7..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/windows11.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/xero.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/xero.png deleted file mode 100644 index 2221c73d..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/xero.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/xerolinux.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/xerolinux.png deleted file mode 100644 index 2221c73d..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/xerolinux.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/xubuntu.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/xubuntu.png deleted file mode 100644 index f43abc7b..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/xubuntu.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/icons/zorin.png b/my-distro-ubuntu-64/grub/themes/my-distro/icons/zorin.png deleted file mode 100644 index c1506c44..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/icons/zorin.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/select_c.png b/my-distro-ubuntu-64/grub/themes/my-distro/select_c.png deleted file mode 100644 index b1f8d580..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/select_c.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/select_e.png b/my-distro-ubuntu-64/grub/themes/my-distro/select_e.png deleted file mode 100644 index 93323686..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/select_e.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/select_w.png b/my-distro-ubuntu-64/grub/themes/my-distro/select_w.png deleted file mode 100644 index 28f6424e..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/select_w.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_c.png b/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_c.png deleted file mode 100644 index d0dd52a2..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_c.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_e.png b/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_e.png deleted file mode 100644 index 394cbe4f..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_e.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_n.png b/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_n.png deleted file mode 100644 index 476f8bc6..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_n.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_ne.png b/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_ne.png deleted file mode 100644 index 9e26959b..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_ne.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_nw.png b/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_nw.png deleted file mode 100644 index 5c3cba87..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_nw.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_s.png b/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_s.png deleted file mode 100644 index 85a8901d..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_s.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_se.png b/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_se.png deleted file mode 100644 index d8627ee5..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_se.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_sw.png b/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_sw.png deleted file mode 100644 index 67c600c8..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_sw.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_w.png b/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_w.png deleted file mode 100644 index d066e2db..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/terminal_box_w.png and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/terminus-12.pf2 b/my-distro-ubuntu-64/grub/themes/my-distro/terminus-12.pf2 deleted file mode 100644 index 60920353..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/terminus-12.pf2 and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/terminus-14.pf2 b/my-distro-ubuntu-64/grub/themes/my-distro/terminus-14.pf2 deleted file mode 100644 index 8ab8bd10..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/terminus-14.pf2 and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/terminus-16.pf2 b/my-distro-ubuntu-64/grub/themes/my-distro/terminus-16.pf2 deleted file mode 100644 index 6e6b25d3..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/terminus-16.pf2 and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/terminus-18.pf2 b/my-distro-ubuntu-64/grub/themes/my-distro/terminus-18.pf2 deleted file mode 100644 index 129cef14..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/terminus-18.pf2 and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/theme.txt b/my-distro-ubuntu-64/grub/themes/my-distro/theme.txt deleted file mode 100644 index 3f26eea5..00000000 --- a/my-distro-ubuntu-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-ubuntu-64/grub/themes/my-distro/ubuntu_regular_17.pf2 b/my-distro-ubuntu-64/grub/themes/my-distro/ubuntu_regular_17.pf2 deleted file mode 100644 index 9405954e..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/ubuntu_regular_17.pf2 and /dev/null differ diff --git a/my-distro-ubuntu-64/grub/themes/my-distro/ubuntu_regular_20.pf2 b/my-distro-ubuntu-64/grub/themes/my-distro/ubuntu_regular_20.pf2 deleted file mode 100644 index 3d903bae..00000000 Binary files a/my-distro-ubuntu-64/grub/themes/my-distro/ubuntu_regular_20.pf2 and /dev/null differ diff --git a/my-distro-ubuntu-64/hooks/live/0030-user-setup b/my-distro-ubuntu-64/hooks/live/0030-user-setup deleted file mode 100755 index 141ab326..00000000 --- a/my-distro-ubuntu-64/hooks/live/0030-user-setup +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh - -. /lib/live/config.sh - -## live-config(7) - System Configuration Components -## Copyright (C) 2016-2020 The Debian Live team -## Copyright (C) 2006-2015 Daniel Baumann -## -## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -## This is free software, and you are welcome to redistribute it -## under certain conditions; see COPYING for details. - - -#set -e - -Cmdline () -{ - # Reading kernel command line - for _PARAMETER in ${LIVE_CONFIG_CMDLINE} - do - case "${_PARAMETER}" in - live-config.user-default-groups=*|user-default-groups=*) - LIVE_USER_DEFAULT_GROUPS="${_PARAMETER#*user-default-groups=}" - ;; - - live-config.user-fullname=*|user-fullname=*) - LIVE_USER_FULLNAME="${_PARAMETER#*user-fullname=}" - ;; - - live-config.username=*|username=*) - LIVE_USERNAME="${_PARAMETER#*username=}" - ;; - esac - done -} - -Init () -{ - # Checking if package is installed or already configured - if ! pkg_is_installed "user-setup" || \ - component_was_executed "user-setup" - then - exit 0 - fi - - echo -n " user-setup" -} - -Config () -{ - # Checking if package is already configured differently - if grep -q "^${LIVE_USERNAME}:" /etc/passwd - then - exit 0 - fi - - # Adjust formating of groups - if [ -n "${LIVE_USER_DEFAULT_GROUPS}" ] - then - LIVE_USER_DEFAULT_GROUPS="$(echo ${LIVE_USER_DEFAULT_GROUPS} | sed -e 's|,| |g')" - fi - - # Make sure user is not in sudo group if sudo is disabled - case "${LIVE_CONFIG_NOROOT}" in - true) - LIVE_USER_DEFAULT_GROUPS="$(echo ${LIVE_USER_DEFAULT_GROUPS} | sed -e 's|sudo||')" - ;; - esac - - # Default password is: live - # passwords can be generated with 'echo "live" | mkpasswd -s', - # a blank password is 'U6aMy0wojraho'. -# _PASSWORD="8Ab05sVQ4LLps" - _PASSWORD="U6aMy0wojraho" - -cat > /tmp/live-config.cfg << EOF -user-setup passwd/make-user boolean true -user-setup passwd/root-password-crypted string * -user-setup passwd/user-password-crypted string ${_PASSWORD} -user-setup passwd/user-default-groups string ${LIVE_USER_DEFAULT_GROUPS} -user-setup passwd/user-fullname string ${LIVE_USER_FULLNAME} -user-setup passwd/username string ${LIVE_USERNAME} -user-setup passwd/user-uid string 1000 -EOF - - debconf-set-selections < /tmp/live-config.cfg - rm -f /tmp/live-config.cfg - - # Workaround for bug in shadow - set +e - /usr/lib/user-setup/user-setup-apply 2>&1 \ - | grep -v "Shadow passwords are now on" - set -e - - # Creating state file - touch /var/lib/live/config/user-setup -} - -Cmdline -Init -Config diff --git a/my-distro-ubuntu-64/hooks/normal/0520-applications.hook.chroot b/my-distro-ubuntu-64/hooks/normal/0520-applications.hook.chroot deleted file mode 100755 index 93d69271..00000000 --- a/my-distro-ubuntu-64/hooks/normal/0520-applications.hook.chroot +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -################################################################################ -# Title: 0520-applications.hook.chroot -# Description: Script to remove packages and other things -# Author: manuel rosa -# Date: Outubro 29, 2023 -# License: GPL-3.0-or-later -################################################################################ - -# Remove software -apt --purge --yes autoremove \ -vim \ -vim-tiny \ -murrine-themes \ -termit \ -gnome-shell \ -gdm3 \ -ubuntu-session \ -mutter \ -gnome-control-center \ -gnome-control-center-data \ -gnome-control-center-faces \ -gnome-online-accounts \ -gedit* \ -apport \ -update-notifier-common \ -update-notifier - -# Lowers the footprint in RAM at the small expense of added size to the ISO. -#update-icon-caches /usr/share/icons/* -find /usr/share/icons -type d -exec gtk-update-icon-cache -f {} \; - -#add flatpak repo to gnome-software -flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - -#fix network-manager install -dpkg-reconfigure network-manager - -#add-architecture i386 -dpkg --add-architecture i386 - diff --git a/my-distro-ubuntu-64/hooks/normal/0550-install-browsers.hook.chroot b/my-distro-ubuntu-64/hooks/normal/0550-install-browsers.hook.chroot deleted file mode 100755 index c460c8d6..00000000 --- a/my-distro-ubuntu-64/hooks/normal/0550-install-browsers.hook.chroot +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -### web browsers instalation hook - -# Install depends -apt install -y apt-transport-https curl - -#Add the repository keyrings -#Brave browser -curl -fsSLo /usr/share/keyrings/brave-browser-archive-keyring.gpg https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg - -#Add repositorys to sources.list -#Brave browser -echo "deb [signed-by=/usr/share/keyrings/brave-browser-archive-keyring.gpg arch=amd64] https://brave-browser-apt-release.s3.brave.com/ stable main"|sudo tee /etc/apt/sources.list.d/brave-browser-release.list - -#Update the repos and the system -apt update && apt -y upgrade - -#install the package -apt install -y brave-browser - diff --git a/my-distro-ubuntu-64/hooks/normal/0600-snap-show-menu-fix.hook.chroot b/my-distro-ubuntu-64/hooks/normal/0600-snap-show-menu-fix.hook.chroot deleted file mode 100755 index 81056ad1..00000000 --- a/my-distro-ubuntu-64/hooks/normal/0600-snap-show-menu-fix.hook.chroot +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# Workaround for using snapd on debian. Thank You - @stevesveryown and peppermint team.. -[ ! -e /etc/skel/.local/share ] && mkdir -p /etc/skel/.local/share -[ ! -e /var/lib/snapd/desktop/applications ] && -mkdir -p /var/lib/snapd/desktop/applications && -chmod 777 /var/lib/snapd/desktop/applications -ln -s /var/lib/snapd/desktop/applications /etc/skel/.local/share/applications -ln -s snap /usr/bin/snap-store - - diff --git a/my-distro-ubuntu-64/icons b/my-distro-ubuntu-64/icons deleted file mode 120000 index 3cfd4cb1..00000000 --- a/my-distro-ubuntu-64/icons +++ /dev/null @@ -1 +0,0 @@ -../icons \ No newline at end of file diff --git a/my-distro-ubuntu-64/install-debian b/my-distro-ubuntu-64/install-debian deleted file mode 120000 index f4895317..00000000 --- a/my-distro-ubuntu-64/install-debian +++ /dev/null @@ -1 +0,0 @@ -../install-debian \ No newline at end of file diff --git a/my-distro-ubuntu-64/lightdm b/my-distro-ubuntu-64/lightdm deleted file mode 120000 index b55b63f5..00000000 --- a/my-distro-ubuntu-64/lightdm +++ /dev/null @@ -1 +0,0 @@ -../lightdm \ No newline at end of file diff --git a/my-distro-ubuntu-64/scripts b/my-distro-ubuntu-64/scripts deleted file mode 120000 index a339954d..00000000 --- a/my-distro-ubuntu-64/scripts +++ /dev/null @@ -1 +0,0 @@ -../scripts \ No newline at end of file diff --git a/my-distro-ubuntu-64/sources-final/sources-final b/my-distro-ubuntu-64/sources-final/sources-final deleted file mode 100755 index 898a0b13..00000000 --- a/my-distro-ubuntu-64/sources-final/sources-final +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# Writes the final sources.list file -# - -CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") -RELEASE="jammy" - -cat << EOF > $CHROOT/etc/apt/sources.list -# See https://wiki.debian.org/SourcesList for more information. - -deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse -#deb-src http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse - -deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse -#deb-src http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse - -deb http://security.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse -#deb-src http://security.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse - -#deb http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse -#deb http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse - -EOF - -exit 0 diff --git a/my-distro-ubuntu-64/sources-final/sources-media b/my-distro-ubuntu-64/sources-final/sources-media deleted file mode 100755 index 644715b6..00000000 --- a/my-distro-ubuntu-64/sources-final/sources-media +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") -MEDIUM_PATH="/run/live/medium" -RELEASE="jammy" - -if [ "$1" = "-u" ]; then - umount $CHROOT/$MEDIUM_PATH - rm $CHROOT/etc/apt/sources.list.d/debian-live-media.list - chroot $CHROOT apt-get update - exit 0 -fi - -# Remove the base sources, we will configure sources in a later phase -rm -f $CHROOT/etc/apt/sources.list.d/base.list - -mkdir -p $CHROOT/$MEDIUM_PATH -mount --bind $MEDIUM_PATH $CHROOT/$MEDIUM_PATH -echo "deb [trusted=yes] file:$MEDIUM_PATH $RELEASE main" > $CHROOT/etc/apt/sources.list.d/debian-live-media.list -chroot $CHROOT apt-get update -# Attempt safest way to remove cruft -rmdir $CHROOT/run/live/medium -rmdir $CHROOT/run/live - -exit 0 diff --git a/my-distro-ubuntu-64/themes b/my-distro-ubuntu-64/themes deleted file mode 120000 index de900312..00000000 --- a/my-distro-ubuntu-64/themes +++ /dev/null @@ -1 +0,0 @@ -../themes \ No newline at end of file diff --git a/my-distro-ubuntu-64/userconfig b/my-distro-ubuntu-64/userconfig deleted file mode 120000 index 8d7a939b..00000000 --- a/my-distro-ubuntu-64/userconfig +++ /dev/null @@ -1 +0,0 @@ -../userconfig \ No newline at end of file