From 6d59d95321a6c1162049383c23843c85587c6300 Mon Sep 17 00:00:00 2001 From: Manuel Date: Tue, 11 Apr 2023 11:07:55 +0000 Subject: [PATCH] new commit --- PepDev32/pepbld.sh | 1 + PepDev32/pepscripts/copy-files-to-chroot.sh | 8 +++++--- PepDev64/pepbld.sh | 1 + PepDev64/pepscripts/copy-files-to-chroot.sh | 8 +++++--- PepDev_arm64/pepbld.sh | 1 + PepDev_arm64/pepscripts/copy-files-to-chroot.sh | 8 +++++--- pepinstaller/preseed/preseed.cfg | 2 +- pepscripts/copy-files-to-chroot.sh | 6 +++--- 8 files changed, 22 insertions(+), 13 deletions(-) diff --git a/PepDev32/pepbld.sh b/PepDev32/pepbld.sh index 65bebda..15a6454 100755 --- a/PepDev32/pepbld.sh +++ b/PepDev32/pepbld.sh @@ -69,6 +69,7 @@ cp $uchinanchu/pepsources/multimedia.list $uchinanchu/fusato/config/includes.ins cp $uchinanchu/pepsources/peppermint.list $uchinanchu/fusato/config/includes.installer/preseed cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.installer/preseed cp $uchinanchu/pepkeyrings/* $uchinanchu/fusato/config/includes.installer/preseed +cp $uchinanchu/pepinfo/* $uchinanchu/fusato/config/includes.installer/preseed # Copy recursive files and sub-directories, containing symlinks. cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary diff --git a/PepDev32/pepscripts/copy-files-to-chroot.sh b/PepDev32/pepscripts/copy-files-to-chroot.sh index 76619e7..1482350 100755 --- a/PepDev32/pepscripts/copy-files-to-chroot.sh +++ b/PepDev32/pepscripts/copy-files-to-chroot.sh @@ -4,11 +4,11 @@ # # SPDX-FileCopyrightText: 2023 PeppemrintOS Team (peppermintosteam@proton.me) -# This script copies a file to the chroot and runs commands during the Debian installation process. +# This script copies a file to target and runs commands during the Debian installation process. # Copy files to the chroot directory -echo "Copying files to chroot..." +echo "Copying files to Target..." cp /preseed/grub /target/etc/default cp /preseed/multimedia.list /target/etc/apt/sources.list.d cp /preseed/peppermint.list /target/etc/apt/sources.list.d @@ -17,6 +17,8 @@ cp /preseed/deb-multimedia-keyring.gpg /target/etc/apt/trusted.gpg.d cp /preseed/peppermint-keyring.gpg /target/etc/apt/trusted.gpg.d cp /preseed/deb-multimedia-keyring.gpg /target/usr/share/keyrings cp /preseed/peppermint-keyring.gpg /target/usr/share/keyrings +cp /preseed/Devuan.info /target//usr/share/python-apt/templates +cp /preseed/Devuan.mirrors /target//usr/share/python-apt/templates cp -r /preseed/themes /target/boot/grub # Run a commands in the chroot @@ -25,7 +27,7 @@ chroot /target update-grub cd /target//usr/share/python-apt/templates/ ln -s Devuan.info Peppermint.info ln -s Devuan.mirrors Peppermint.mirrors -cd /target//usr/share/distro-info/ +cd /target/usr/share/distro-info/ ln -s devuan.csv peppermint.csv exit diff --git a/PepDev64/pepbld.sh b/PepDev64/pepbld.sh index e1845e7..7af7d23 100755 --- a/PepDev64/pepbld.sh +++ b/PepDev64/pepbld.sh @@ -68,6 +68,7 @@ cp $uchinanchu/pepsources/multimedia.list $uchinanchu/fusato/config/includes.ins cp $uchinanchu/pepsources/peppermint.list $uchinanchu/fusato/config/includes.installer/preseed cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.installer/preseed cp $uchinanchu/pepkeyrings/* $uchinanchu/fusato/config/includes.installer/preseed +cp $uchinanchu/pepinfo/* $uchinanchu/fusato/config/includes.installer/preseed # Copy recursive files and sub-directories, containing symlinks. cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary diff --git a/PepDev64/pepscripts/copy-files-to-chroot.sh b/PepDev64/pepscripts/copy-files-to-chroot.sh index 76619e7..1482350 100755 --- a/PepDev64/pepscripts/copy-files-to-chroot.sh +++ b/PepDev64/pepscripts/copy-files-to-chroot.sh @@ -4,11 +4,11 @@ # # SPDX-FileCopyrightText: 2023 PeppemrintOS Team (peppermintosteam@proton.me) -# This script copies a file to the chroot and runs commands during the Debian installation process. +# This script copies a file to target and runs commands during the Debian installation process. # Copy files to the chroot directory -echo "Copying files to chroot..." +echo "Copying files to Target..." cp /preseed/grub /target/etc/default cp /preseed/multimedia.list /target/etc/apt/sources.list.d cp /preseed/peppermint.list /target/etc/apt/sources.list.d @@ -17,6 +17,8 @@ cp /preseed/deb-multimedia-keyring.gpg /target/etc/apt/trusted.gpg.d cp /preseed/peppermint-keyring.gpg /target/etc/apt/trusted.gpg.d cp /preseed/deb-multimedia-keyring.gpg /target/usr/share/keyrings cp /preseed/peppermint-keyring.gpg /target/usr/share/keyrings +cp /preseed/Devuan.info /target//usr/share/python-apt/templates +cp /preseed/Devuan.mirrors /target//usr/share/python-apt/templates cp -r /preseed/themes /target/boot/grub # Run a commands in the chroot @@ -25,7 +27,7 @@ chroot /target update-grub cd /target//usr/share/python-apt/templates/ ln -s Devuan.info Peppermint.info ln -s Devuan.mirrors Peppermint.mirrors -cd /target//usr/share/distro-info/ +cd /target/usr/share/distro-info/ ln -s devuan.csv peppermint.csv exit diff --git a/PepDev_arm64/pepbld.sh b/PepDev_arm64/pepbld.sh index d368e8f..7b0cac0 100755 --- a/PepDev_arm64/pepbld.sh +++ b/PepDev_arm64/pepbld.sh @@ -72,6 +72,7 @@ cp $uchinanchu/pepsources/multimedia.list $uchinanchu/fusato/config/includes.ins cp $uchinanchu/pepsources/peppermint.list $uchinanchu/fusato/config/includes.installer/preseed cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.installer/preseed cp $uchinanchu/pepkeyrings/* $uchinanchu/fusato/config/includes.installer/preseed +cp $uchinanchu/pepinfo/* $uchinanchu/fusato/config/includes.installer/preseed # Copy recursive files and sub-directories, containing symlinks. cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary diff --git a/PepDev_arm64/pepscripts/copy-files-to-chroot.sh b/PepDev_arm64/pepscripts/copy-files-to-chroot.sh index 76619e7..1482350 100755 --- a/PepDev_arm64/pepscripts/copy-files-to-chroot.sh +++ b/PepDev_arm64/pepscripts/copy-files-to-chroot.sh @@ -4,11 +4,11 @@ # # SPDX-FileCopyrightText: 2023 PeppemrintOS Team (peppermintosteam@proton.me) -# This script copies a file to the chroot and runs commands during the Debian installation process. +# This script copies a file to target and runs commands during the Debian installation process. # Copy files to the chroot directory -echo "Copying files to chroot..." +echo "Copying files to Target..." cp /preseed/grub /target/etc/default cp /preseed/multimedia.list /target/etc/apt/sources.list.d cp /preseed/peppermint.list /target/etc/apt/sources.list.d @@ -17,6 +17,8 @@ cp /preseed/deb-multimedia-keyring.gpg /target/etc/apt/trusted.gpg.d cp /preseed/peppermint-keyring.gpg /target/etc/apt/trusted.gpg.d cp /preseed/deb-multimedia-keyring.gpg /target/usr/share/keyrings cp /preseed/peppermint-keyring.gpg /target/usr/share/keyrings +cp /preseed/Devuan.info /target//usr/share/python-apt/templates +cp /preseed/Devuan.mirrors /target//usr/share/python-apt/templates cp -r /preseed/themes /target/boot/grub # Run a commands in the chroot @@ -25,7 +27,7 @@ chroot /target update-grub cd /target//usr/share/python-apt/templates/ ln -s Devuan.info Peppermint.info ln -s Devuan.mirrors Peppermint.mirrors -cd /target//usr/share/distro-info/ +cd /target/usr/share/distro-info/ ln -s devuan.csv peppermint.csv exit diff --git a/pepinstaller/preseed/preseed.cfg b/pepinstaller/preseed/preseed.cfg index f65728e..2dc0dbb 100644 --- a/pepinstaller/preseed/preseed.cfg +++ b/pepinstaller/preseed/preseed.cfg @@ -2,7 +2,7 @@ # # SPDX-FileCopyrightText: 2023 PeppermintOS Team (peppermintosteam@proton.me) -#This preseed file includes configuration settings for a custom repository with the 'contrib' and 'non-free' components #enabled, as well as disabling the automatic response to the Debian popularity contest. In addition, it configures #various options for the Grub bootloader, including the timeout, command line parameters, and splash screen settings #etc. +#This preseed file includes configuration settings for a custom repository with the 'contrib' and 'non-free' components #enabled, as well as disabling the automatic response to the Debian popularity contest. In addition, it configures #various options for the Grub bootloader, including the timeout, command line parameters, and splash screen settings etc. # Add your custom repositories d-i apt-setup/local0/repository string \ diff --git a/pepscripts/copy-files-to-chroot.sh b/pepscripts/copy-files-to-chroot.sh index 158e809..f16cc86 100755 --- a/pepscripts/copy-files-to-chroot.sh +++ b/pepscripts/copy-files-to-chroot.sh @@ -4,11 +4,11 @@ # # SPDX-FileCopyrightText: 2023 PeppemrintOS Team (peppermintosteam@proton.me) -# This script copies a file to the chroot and runs commands during the Debian installation process. +# This script copies a file to target and runs commands during the Debian installation process. # Copy files to the chroot directory -echo "Copying files to chroot..." +echo "Copying files to Target..." cp /preseed/grub /target/etc/default cp /preseed/multimedia.list /target/etc/apt/sources.list.d cp /preseed/peppermint.list /target/etc/apt/sources.list.d @@ -25,7 +25,7 @@ chroot /target update-grub cd /target//usr/share/python-apt/templates/ ln -s Debian.info Peppermint.info ln -s Debian.mirrors Peppermint.mirrors -cd /target//usr/share/distro-info/ +cd /target/usr/share/distro-info/ ln -s debian.csv peppermint.csv exit