diff --git a/bookworm/pepbld.sh b/bookworm/pepbld.sh index 2792bd5..db481db 100755 --- a/bookworm/pepbld.sh +++ b/bookworm/pepbld.sh @@ -56,6 +56,8 @@ mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/default mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share mkdir -p $uchinanchu/fusato/config/includes.chroot/etc mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/firewalld/zones +mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/grub +mkdir -p $uchinanchu/fusato/config/includes.installer/usr/lib/finish-install.d # Install software echo "#Install system packages. @@ -78,7 +80,7 @@ cockpit-pcp podman nfs-common firewalld -#samba +samba cups gvfs-backends git @@ -87,12 +89,12 @@ wget " >> $uchinanchu/fusato/config/package-lists/package.list.chroot # Copy single files and folder to the chroot -cp $uchinanchu/pepgrub/grub $uchinanchu/fusato/config/includes.chroot/etc/default +cp $uchinanchu/pepgrub/grub $uchinanchu/fusato/config/includes.installer/preseed/grub cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives cp $uchinanchu/pepfirewall/* $uchinanchu/fusato/config/includes.chroot/etc/firewalld/zones cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer - +cp $uchinanchu/pepscripts/* $uchinanchu/fusato/config/includes.installer/usr/lib/finish-install.d # Copy recursive files and sub-directories, containing symlinks. cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary diff --git a/bookworm/pepscripts b/bookworm/pepscripts new file mode 120000 index 0000000..c35067c --- /dev/null +++ b/bookworm/pepscripts @@ -0,0 +1 @@ +../pepscripts \ No newline at end of file diff --git a/daedalus/pepscripts b/daedalus/pepscripts new file mode 120000 index 0000000..c35067c --- /dev/null +++ b/daedalus/pepscripts @@ -0,0 +1 @@ +../pepscripts \ No newline at end of file diff --git a/peploadersplash/boot/grub/live-theme/background.png b/peploadersplash/boot/grub/live-theme/background.png index 6965387..bf8fd87 100644 Binary files a/peploadersplash/boot/grub/live-theme/background.png and b/peploadersplash/boot/grub/live-theme/background.png differ diff --git a/peploadersplash/boot/grub/live-theme/icons/gnu-linux.png b/peploadersplash/boot/grub/live-theme/icons/gnu-linux.png index 326b659..db2fcfd 100644 Binary files a/peploadersplash/boot/grub/live-theme/icons/gnu-linux.png and b/peploadersplash/boot/grub/live-theme/icons/gnu-linux.png differ diff --git a/peploadersplash/boot/grub/live-theme/icons/lfs.png b/peploadersplash/boot/grub/live-theme/icons/lfs.png index 326b659..2c54036 100644 Binary files a/peploadersplash/boot/grub/live-theme/icons/lfs.png and b/peploadersplash/boot/grub/live-theme/icons/lfs.png differ diff --git a/peploadersplash/boot/grub/live-theme/icons/linux.png b/peploadersplash/boot/grub/live-theme/icons/linux.png index 326b659..348ebdd 100644 Binary files a/peploadersplash/boot/grub/live-theme/icons/linux.png and b/peploadersplash/boot/grub/live-theme/icons/linux.png differ diff --git a/peploadersplash/boot/grub/live-theme/icons/unknown.png b/peploadersplash/boot/grub/live-theme/icons/unknown.png index 326b659..4733dc8 100644 Binary files a/peploadersplash/boot/grub/live-theme/icons/unknown.png and b/peploadersplash/boot/grub/live-theme/icons/unknown.png differ diff --git a/peploadersplash/boot/grub/splash.png b/peploadersplash/boot/grub/splash.png index 6965387..bf8fd87 100644 Binary files a/peploadersplash/boot/grub/splash.png and b/peploadersplash/boot/grub/splash.png differ diff --git a/peploadersplash/isolinux/menu.cfg b/peploadersplash/isolinux/menu.cfg index dce3eca..cf652c3 100644 --- a/peploadersplash/isolinux/menu.cfg +++ b/peploadersplash/isolinux/menu.cfg @@ -1,7 +1,7 @@ menu hshift 4 menu width 70 -menu title PeppermintOS Server Edition installer menu (BIOS mode) +menu title PeppermintOS net installer menu (BIOS mode) include stdmenu.cfg include gtk.cfg include txt.cfg diff --git a/peploadersplash/isolinux/splash.png b/peploadersplash/isolinux/splash.png index 6965387..bf8fd87 100644 Binary files a/peploadersplash/isolinux/splash.png and b/peploadersplash/isolinux/splash.png differ diff --git a/pepscripts/06copy-files-to-cdrom b/pepscripts/06copy-files-to-cdrom new file mode 100755 index 0000000..93a3bd5 --- /dev/null +++ b/pepscripts/06copy-files-to-cdrom @@ -0,0 +1,18 @@ +#!/bin/sh -e + +# SPDX-License-Identifier: GPL-3.0-or-later +# +# SPDX-FileCopyrightText: 2023 PeppemrintOS Team (peppermintosteam@proton.me) + +# This script copies a file to the chroot and runs commands during the Debian installation process. + +# Copy files to the chroot directory +echo "Copying files to chroot..." +cp /preseed/grub/grub /cdrom/etc/default + +# update grub and initramfs +chroot /cdrom update-initramfs -u +chroot /cdrom update-grub + +exit 0 +