From 27d16f28a825e51b9eb18f606f5de8f62c555710 Mon Sep 17 00:00:00 2001 From: manuel Date: Thu, 16 Nov 2023 12:32:50 -0100 Subject: [PATCH] atualizar os scripts de hook --- deb-installer/preseed/preseed.cfg | 23 +++++++----- deb-installer/scripts/07final-cleanup | 12 ++++--- deb-installer/scripts/07grub-config | 35 +++++++++++++++++++ .../scripts/07rebuild-icon-caches | 11 +++--- deb-installer/scripts/07update-system | 4 +-- .../0600-snap-show-menu-fix.hook.chroot | 8 +++++ my-distro-debian-32-pae/build.sh | 4 +-- my-distro-debian-32/build.sh | 4 +-- my-distro-debian-64/build.sh | 4 +-- my-distro-devuan-32-pae/build.sh | 4 +-- .../deb-installer/preseed/preseed.cfg | 25 +++++++------ .../deb-installer/scripts/07final-cleanup | 12 ++++--- .../deb-installer/scripts/07grub-config | 35 +++++++++++++++++++ .../scripts/07rebuild-icon-caches | 13 +++++++ .../deb-installer/scripts/07update-system | 4 +-- my-distro-devuan-32/build.sh | 4 +-- .../deb-installer/preseed/preseed.cfg | 25 +++++++------ .../deb-installer/scripts/07final-cleanup | 12 ++++--- .../deb-installer/scripts/07grub-config | 35 +++++++++++++++++++ .../scripts/07rebuild-icon-caches | 13 +++++++ .../deb-installer/scripts/07update-system | 4 +-- my-distro-devuan-64/build.sh | 4 +-- .../deb-installer/preseed/preseed.cfg | 25 +++++++------ .../deb-installer/scripts/07final-cleanup | 12 ++++--- .../deb-installer/scripts/07grub-config | 35 +++++++++++++++++++ .../scripts/07rebuild-icon-caches | 13 +++++++ .../deb-installer/scripts/07update-system | 4 +-- scripts/07final-cleanup | 18 ---------- 28 files changed, 298 insertions(+), 104 deletions(-) create mode 100755 deb-installer/scripts/07grub-config rename scripts/07update-system => deb-installer/scripts/07rebuild-icon-caches (55%) create mode 100755 my-distro-devuan-32-pae/deb-installer/scripts/07grub-config create mode 100755 my-distro-devuan-32-pae/deb-installer/scripts/07rebuild-icon-caches create mode 100755 my-distro-devuan-32/deb-installer/scripts/07grub-config create mode 100755 my-distro-devuan-32/deb-installer/scripts/07rebuild-icon-caches create mode 100755 my-distro-devuan-64/deb-installer/scripts/07grub-config create mode 100755 my-distro-devuan-64/deb-installer/scripts/07rebuild-icon-caches delete mode 100755 scripts/07final-cleanup diff --git a/deb-installer/preseed/preseed.cfg b/deb-installer/preseed/preseed.cfg index cdca71a..62e4315 100644 --- a/deb-installer/preseed/preseed.cfg +++ b/deb-installer/preseed/preseed.cfg @@ -1,23 +1,25 @@ -# SPDX-License-Identifier: GPL-3.0-or-later -# -# SPDX-FileCopyrightText: 2023 PeppermintOS Team (peppermintosteam@proton.me) +################################################################################ +# Title: Preseed.cfg +# Description: This preseed file includes configuration settings for a custom debian-installer iso. +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ -#This preseed file includes configuration settings for a custom debian-installer iso. - -# You can choose to install non-free and contrib software. +### You can choose to install non-free and contrib software. d-i apt-setup/non-free boolean true d-i apt-setup/contrib boolean true d-i apt-setup/non-free-firmware boolean true -# Select which update services to use; define the mirrors to be used. +### Select which update services to use; define the mirrors to be used. # Values shown below are the normal defaults. d-i apt-setup/services-select multiselect security, updates, backports d-i apt-setup/security_host string security.debian.org -# Uncomment this to add multiarch configuration for i386 +### Uncomment this to add multiarch configuration for i386 d-i apt-setup/multiarch string i386 -# Remove popularity-contest +### Remove popularity-contest popularity-contest popularity-contest/participate boolean false ### Account setup @@ -25,3 +27,6 @@ popularity-contest popularity-contest/participate boolean false # use sudo). d-i passwd/root-login boolean false +### Keep /etc/default/grub file +d-i grub-pc/default string keep + diff --git a/deb-installer/scripts/07final-cleanup b/deb-installer/scripts/07final-cleanup index ce68c79..3717444 100755 --- a/deb-installer/scripts/07final-cleanup +++ b/deb-installer/scripts/07final-cleanup @@ -1,10 +1,12 @@ #!/bin/sh -e -# SPDX-License-Identifier: GPL-3.0-or-later -# -# SPDX-FileCopyrightText: 2023 PeppermintOS Team (peppermintosteam@proton.me) - -# This script removes unwanted software and files after Debian installation. +################################################################################ +# Title: Final cleanup +# Description: This script removes unwanted software and files after Debian installation. +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ # Remove unwanted packages chroot /target apt purge --autoremove -y \ diff --git a/deb-installer/scripts/07grub-config b/deb-installer/scripts/07grub-config new file mode 100755 index 0000000..0d4611e --- /dev/null +++ b/deb-installer/scripts/07grub-config @@ -0,0 +1,35 @@ +#!/bin/sh -e + +################################################################################ +# Title: Grub-config script +# Description: script to configure thr grub defaults +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ + +# This script configures grub defaults after Debian installation. + +# Defines the variables +GRUB_DEFAULT=0 +GRUB_TIMEOUT=5 +GRUB_DISTRIBUTOR="My-distro" +GRUB_CMDLINE_LINUX_DEFAULT="quiet splash" +GRUB_CMDLINE_LINUX="" +GRUB_GFXMODE=1440x900 +GRUB_DISABLE_OS_PROBER=false + +# GRUB configuration file path +GRUB_CONFIG_FILE="/target/etc/default/grub" + +# Modify the GRUB file +sed -i "s/^GRUB_DEFAULT=.*/GRUB_DEFAULT=$GRUB_DEFAULT/" $GRUB_CONFIG_FILE +sed -i "s/^GRUB_TIMEOUT=.*/GRUB_TIMEOUT=$GRUB_TIMEOUT/" $GRUB_CONFIG_FILE +sed -i "s/^GRUB_DISTRIBUTOR=.*/GRUB_DISTRIBUTOR=\"$GRUB_DISTRIBUTOR\"/" $GRUB_CONFIG_FILE +sed -i "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"$GRUB_CMDLINE_LINUX_DEFAULT\"/" $GRUB_CONFIG_FILE +sed -i "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"$GRUB_CMDLINE_LINUX\"/" $GRUB_CONFIG_FILE +sed -i "s/^#GRUB_GFXMODE=.*/GRUB_GFXMODE=$GRUB_GFXMODE/" $GRUB_CONFIG_FILE +sed -i "s/^#GRUB_DISABLE_OS_PROBER=.*/GRUB_DISABLE_OS_PROBER=$GRUB_DISABLE_OS_PROBER/" $GRUB_CONFIG_FILE + +# Run update-grub after modifying the file +chroot /target update-grub diff --git a/scripts/07update-system b/deb-installer/scripts/07rebuild-icon-caches similarity index 55% rename from scripts/07update-system rename to deb-installer/scripts/07rebuild-icon-caches index c2dc42e..fe81076 100755 --- a/scripts/07update-system +++ b/deb-installer/scripts/07rebuild-icon-caches @@ -1,16 +1,13 @@ #!/bin/sh -e ################################################################################ -# Title: build-all.sh -# Description: This script updates the system after Debian installation. +# Title: Rebuild icon caches script +# Description: This script rebuilds the icon caches after Debian installation. # Author: manuel rosa # Date: Outubro 29, 2023 # License: GPL-3.0-or-later ################################################################################ -# Update the system -chroot /target apt update -chroot /target apt upgrade -y +# Rebuild the icon caches +chroot /target find /usr/share/icons -type d -exec gtk-update-icon-cache -f {} \; -# Clean up unnecessary packages -chroot /target apt autoremove -y diff --git a/deb-installer/scripts/07update-system b/deb-installer/scripts/07update-system index 81b6dfc..79111a6 100755 --- a/deb-installer/scripts/07update-system +++ b/deb-installer/scripts/07update-system @@ -1,8 +1,8 @@ #!/bin/sh -e ################################################################################ -# Title: Bldhelper.sh -# Description: Script to build My-distro ISO image +# Title: Update system +# Description: Script to update the system after install # Author: manuel rosa # Date: Outubro 29, 2023 # License: GPL-3.0-or-later diff --git a/hooks/normal/0600-snap-show-menu-fix.hook.chroot b/hooks/normal/0600-snap-show-menu-fix.hook.chroot index 81056ad..a0c2321 100755 --- a/hooks/normal/0600-snap-show-menu-fix.hook.chroot +++ b/hooks/normal/0600-snap-show-menu-fix.hook.chroot @@ -1,5 +1,13 @@ #!/bin/bash +################################################################################ +# Title: 0600-snap-show-menu-fix.hook.chroot +# Description: Workaround for using snapd on debian. Thank You - @stevesveryown and peppermint team.. +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ + # 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 ] && diff --git a/my-distro-debian-32-pae/build.sh b/my-distro-debian-32-pae/build.sh index 6d88fa2..322ad60 100755 --- a/my-distro-debian-32-pae/build.sh +++ b/my-distro-debian-32-pae/build.sh @@ -249,7 +249,7 @@ mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop -#mkdir -p $build/build/config/includes.chroot/etc/default +mkdir -p $build/build/config/includes.chroot/etc/default mkdir -p $build/build/config/includes.chroot/boot/grub mkdir -p $build/build/config/includes.installer/usr/lib/finish-install.d mkdir -p $build/build/config/includes.installer//usr/share @@ -262,7 +262,7 @@ 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/grub/grub $build/build/config/includes.chroot/etc/default cp $build/deb-installer/scripts/* $build/build/config/includes.installer/usr/lib/finish-install.d cp $build/deb-installer/preseed/* $build/build/config/includes.installer diff --git a/my-distro-debian-32/build.sh b/my-distro-debian-32/build.sh index 3518e48..d3feb36 100755 --- a/my-distro-debian-32/build.sh +++ b/my-distro-debian-32/build.sh @@ -250,7 +250,7 @@ mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop -#mkdir -p $build/build/config/includes.chroot/etc/default +mkdir -p $build/build/config/includes.chroot/etc/default mkdir -p $build/build/config/includes.chroot/boot/grub mkdir -p $build/build/config/includes.installer/usr/lib/finish-install.d mkdir -p $build/build/config/includes.installer//usr/share @@ -263,7 +263,7 @@ 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/grub/grub $build/build/config/includes.chroot/etc/default cp $build/deb-installer/scripts/* $build/build/config/includes.installer/usr/lib/finish-install.d cp $build/deb-installer/preseed/* $build/build/config/includes.installer diff --git a/my-distro-debian-64/build.sh b/my-distro-debian-64/build.sh index 62c9fc6..bd3b654 100755 --- a/my-distro-debian-64/build.sh +++ b/my-distro-debian-64/build.sh @@ -250,7 +250,7 @@ mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop -#mkdir -p $build/build/config/includes.chroot/etc/default +mkdir -p $build/build/config/includes.chroot/etc/default mkdir -p $build/build/config/includes.chroot/boot/grub mkdir -p $build/build/config/includes.installer/usr/lib/finish-install.d mkdir -p $build/build/config/includes.installer//usr/share @@ -262,7 +262,7 @@ 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/grub/grub $build/build/config/includes.chroot/etc/default +cp $build/grub/grub $build/build/config/includes.chroot/etc/default cp $build/deb-installer/scripts/* $build/build/config/includes.installer/usr/lib/finish-install.d cp $build/deb-installer/preseed/* $build/build/config/includes.installer diff --git a/my-distro-devuan-32-pae/build.sh b/my-distro-devuan-32-pae/build.sh index b1d2435..0365721 100755 --- a/my-distro-devuan-32-pae/build.sh +++ b/my-distro-devuan-32-pae/build.sh @@ -250,7 +250,7 @@ mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop -#mkdir -p $build/build/config/includes.chroot/etc/default +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 @@ -264,7 +264,7 @@ 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/grub/grub $build/build/config/includes.chroot/etc/default cp $build/deb-installer/scripts/* $build/build/config/includes.installer/usr/lib/finish-install.d cp $build/deb-installer/preseed/* $build/build/config/includes.installer diff --git a/my-distro-devuan-32-pae/deb-installer/preseed/preseed.cfg b/my-distro-devuan-32-pae/deb-installer/preseed/preseed.cfg index d37f511..62e4315 100644 --- a/my-distro-devuan-32-pae/deb-installer/preseed/preseed.cfg +++ b/my-distro-devuan-32-pae/deb-installer/preseed/preseed.cfg @@ -1,23 +1,25 @@ -# SPDX-License-Identifier: GPL-3.0-or-later -# -# SPDX-FileCopyrightText: 2023 PeppermintOS Team (peppermintosteam@proton.me) +################################################################################ +# Title: Preseed.cfg +# Description: This preseed file includes configuration settings for a custom debian-installer iso. +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ -#This preseed file includes configuration settings for a custom debian-installer iso. - -# You can choose to install non-free and contrib software. +### You can choose to install non-free and contrib software. d-i apt-setup/non-free boolean true d-i apt-setup/contrib boolean true d-i apt-setup/non-free-firmware boolean true -# Select which update services to use; define the mirrors to be used. +### Select which update services to use; define the mirrors to be used. # Values shown below are the normal defaults. d-i apt-setup/services-select multiselect security, updates, backports -d-i apt-setup/security_host string deb.devuan.org/merged +d-i apt-setup/security_host string security.debian.org -# Uncomment this to add multiarch configuration for i386 +### Uncomment this to add multiarch configuration for i386 d-i apt-setup/multiarch string i386 -# Remove popularity-contest +### Remove popularity-contest popularity-contest popularity-contest/participate boolean false ### Account setup @@ -25,3 +27,6 @@ popularity-contest popularity-contest/participate boolean false # use sudo). d-i passwd/root-login boolean false +### Keep /etc/default/grub file +d-i grub-pc/default string keep + diff --git a/my-distro-devuan-32-pae/deb-installer/scripts/07final-cleanup b/my-distro-devuan-32-pae/deb-installer/scripts/07final-cleanup index ce68c79..3717444 100755 --- a/my-distro-devuan-32-pae/deb-installer/scripts/07final-cleanup +++ b/my-distro-devuan-32-pae/deb-installer/scripts/07final-cleanup @@ -1,10 +1,12 @@ #!/bin/sh -e -# SPDX-License-Identifier: GPL-3.0-or-later -# -# SPDX-FileCopyrightText: 2023 PeppermintOS Team (peppermintosteam@proton.me) - -# This script removes unwanted software and files after Debian installation. +################################################################################ +# Title: Final cleanup +# Description: This script removes unwanted software and files after Debian installation. +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ # Remove unwanted packages chroot /target apt purge --autoremove -y \ diff --git a/my-distro-devuan-32-pae/deb-installer/scripts/07grub-config b/my-distro-devuan-32-pae/deb-installer/scripts/07grub-config new file mode 100755 index 0000000..0d4611e --- /dev/null +++ b/my-distro-devuan-32-pae/deb-installer/scripts/07grub-config @@ -0,0 +1,35 @@ +#!/bin/sh -e + +################################################################################ +# Title: Grub-config script +# Description: script to configure thr grub defaults +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ + +# This script configures grub defaults after Debian installation. + +# Defines the variables +GRUB_DEFAULT=0 +GRUB_TIMEOUT=5 +GRUB_DISTRIBUTOR="My-distro" +GRUB_CMDLINE_LINUX_DEFAULT="quiet splash" +GRUB_CMDLINE_LINUX="" +GRUB_GFXMODE=1440x900 +GRUB_DISABLE_OS_PROBER=false + +# GRUB configuration file path +GRUB_CONFIG_FILE="/target/etc/default/grub" + +# Modify the GRUB file +sed -i "s/^GRUB_DEFAULT=.*/GRUB_DEFAULT=$GRUB_DEFAULT/" $GRUB_CONFIG_FILE +sed -i "s/^GRUB_TIMEOUT=.*/GRUB_TIMEOUT=$GRUB_TIMEOUT/" $GRUB_CONFIG_FILE +sed -i "s/^GRUB_DISTRIBUTOR=.*/GRUB_DISTRIBUTOR=\"$GRUB_DISTRIBUTOR\"/" $GRUB_CONFIG_FILE +sed -i "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"$GRUB_CMDLINE_LINUX_DEFAULT\"/" $GRUB_CONFIG_FILE +sed -i "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"$GRUB_CMDLINE_LINUX\"/" $GRUB_CONFIG_FILE +sed -i "s/^#GRUB_GFXMODE=.*/GRUB_GFXMODE=$GRUB_GFXMODE/" $GRUB_CONFIG_FILE +sed -i "s/^#GRUB_DISABLE_OS_PROBER=.*/GRUB_DISABLE_OS_PROBER=$GRUB_DISABLE_OS_PROBER/" $GRUB_CONFIG_FILE + +# Run update-grub after modifying the file +chroot /target update-grub diff --git a/my-distro-devuan-32-pae/deb-installer/scripts/07rebuild-icon-caches b/my-distro-devuan-32-pae/deb-installer/scripts/07rebuild-icon-caches new file mode 100755 index 0000000..fe81076 --- /dev/null +++ b/my-distro-devuan-32-pae/deb-installer/scripts/07rebuild-icon-caches @@ -0,0 +1,13 @@ +#!/bin/sh -e + +################################################################################ +# Title: Rebuild icon caches script +# Description: This script rebuilds the icon caches after Debian installation. +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ + +# Rebuild the icon caches +chroot /target find /usr/share/icons -type d -exec gtk-update-icon-cache -f {} \; + diff --git a/my-distro-devuan-32-pae/deb-installer/scripts/07update-system b/my-distro-devuan-32-pae/deb-installer/scripts/07update-system index 81b6dfc..79111a6 100755 --- a/my-distro-devuan-32-pae/deb-installer/scripts/07update-system +++ b/my-distro-devuan-32-pae/deb-installer/scripts/07update-system @@ -1,8 +1,8 @@ #!/bin/sh -e ################################################################################ -# Title: Bldhelper.sh -# Description: Script to build My-distro ISO image +# Title: Update system +# Description: Script to update the system after install # Author: manuel rosa # Date: Outubro 29, 2023 # License: GPL-3.0-or-later diff --git a/my-distro-devuan-32/build.sh b/my-distro-devuan-32/build.sh index 06d365d..12c5f65 100755 --- a/my-distro-devuan-32/build.sh +++ b/my-distro-devuan-32/build.sh @@ -251,7 +251,7 @@ mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop -#mkdir -p $build/build/config/includes.chroot/etc/default +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 @@ -265,7 +265,7 @@ 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/grub/grub $build/build/config/includes.chroot/etc/default cp $build/deb-installer/scripts/* $build/build/config/includes.installer/usr/lib/finish-install.d cp $build/deb-installer/preseed/* $build/build/config/includes.installer diff --git a/my-distro-devuan-32/deb-installer/preseed/preseed.cfg b/my-distro-devuan-32/deb-installer/preseed/preseed.cfg index d37f511..62e4315 100644 --- a/my-distro-devuan-32/deb-installer/preseed/preseed.cfg +++ b/my-distro-devuan-32/deb-installer/preseed/preseed.cfg @@ -1,23 +1,25 @@ -# SPDX-License-Identifier: GPL-3.0-or-later -# -# SPDX-FileCopyrightText: 2023 PeppermintOS Team (peppermintosteam@proton.me) +################################################################################ +# Title: Preseed.cfg +# Description: This preseed file includes configuration settings for a custom debian-installer iso. +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ -#This preseed file includes configuration settings for a custom debian-installer iso. - -# You can choose to install non-free and contrib software. +### You can choose to install non-free and contrib software. d-i apt-setup/non-free boolean true d-i apt-setup/contrib boolean true d-i apt-setup/non-free-firmware boolean true -# Select which update services to use; define the mirrors to be used. +### Select which update services to use; define the mirrors to be used. # Values shown below are the normal defaults. d-i apt-setup/services-select multiselect security, updates, backports -d-i apt-setup/security_host string deb.devuan.org/merged +d-i apt-setup/security_host string security.debian.org -# Uncomment this to add multiarch configuration for i386 +### Uncomment this to add multiarch configuration for i386 d-i apt-setup/multiarch string i386 -# Remove popularity-contest +### Remove popularity-contest popularity-contest popularity-contest/participate boolean false ### Account setup @@ -25,3 +27,6 @@ popularity-contest popularity-contest/participate boolean false # use sudo). d-i passwd/root-login boolean false +### Keep /etc/default/grub file +d-i grub-pc/default string keep + diff --git a/my-distro-devuan-32/deb-installer/scripts/07final-cleanup b/my-distro-devuan-32/deb-installer/scripts/07final-cleanup index ce68c79..3717444 100755 --- a/my-distro-devuan-32/deb-installer/scripts/07final-cleanup +++ b/my-distro-devuan-32/deb-installer/scripts/07final-cleanup @@ -1,10 +1,12 @@ #!/bin/sh -e -# SPDX-License-Identifier: GPL-3.0-or-later -# -# SPDX-FileCopyrightText: 2023 PeppermintOS Team (peppermintosteam@proton.me) - -# This script removes unwanted software and files after Debian installation. +################################################################################ +# Title: Final cleanup +# Description: This script removes unwanted software and files after Debian installation. +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ # Remove unwanted packages chroot /target apt purge --autoremove -y \ diff --git a/my-distro-devuan-32/deb-installer/scripts/07grub-config b/my-distro-devuan-32/deb-installer/scripts/07grub-config new file mode 100755 index 0000000..0d4611e --- /dev/null +++ b/my-distro-devuan-32/deb-installer/scripts/07grub-config @@ -0,0 +1,35 @@ +#!/bin/sh -e + +################################################################################ +# Title: Grub-config script +# Description: script to configure thr grub defaults +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ + +# This script configures grub defaults after Debian installation. + +# Defines the variables +GRUB_DEFAULT=0 +GRUB_TIMEOUT=5 +GRUB_DISTRIBUTOR="My-distro" +GRUB_CMDLINE_LINUX_DEFAULT="quiet splash" +GRUB_CMDLINE_LINUX="" +GRUB_GFXMODE=1440x900 +GRUB_DISABLE_OS_PROBER=false + +# GRUB configuration file path +GRUB_CONFIG_FILE="/target/etc/default/grub" + +# Modify the GRUB file +sed -i "s/^GRUB_DEFAULT=.*/GRUB_DEFAULT=$GRUB_DEFAULT/" $GRUB_CONFIG_FILE +sed -i "s/^GRUB_TIMEOUT=.*/GRUB_TIMEOUT=$GRUB_TIMEOUT/" $GRUB_CONFIG_FILE +sed -i "s/^GRUB_DISTRIBUTOR=.*/GRUB_DISTRIBUTOR=\"$GRUB_DISTRIBUTOR\"/" $GRUB_CONFIG_FILE +sed -i "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"$GRUB_CMDLINE_LINUX_DEFAULT\"/" $GRUB_CONFIG_FILE +sed -i "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"$GRUB_CMDLINE_LINUX\"/" $GRUB_CONFIG_FILE +sed -i "s/^#GRUB_GFXMODE=.*/GRUB_GFXMODE=$GRUB_GFXMODE/" $GRUB_CONFIG_FILE +sed -i "s/^#GRUB_DISABLE_OS_PROBER=.*/GRUB_DISABLE_OS_PROBER=$GRUB_DISABLE_OS_PROBER/" $GRUB_CONFIG_FILE + +# Run update-grub after modifying the file +chroot /target update-grub diff --git a/my-distro-devuan-32/deb-installer/scripts/07rebuild-icon-caches b/my-distro-devuan-32/deb-installer/scripts/07rebuild-icon-caches new file mode 100755 index 0000000..fe81076 --- /dev/null +++ b/my-distro-devuan-32/deb-installer/scripts/07rebuild-icon-caches @@ -0,0 +1,13 @@ +#!/bin/sh -e + +################################################################################ +# Title: Rebuild icon caches script +# Description: This script rebuilds the icon caches after Debian installation. +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ + +# Rebuild the icon caches +chroot /target find /usr/share/icons -type d -exec gtk-update-icon-cache -f {} \; + diff --git a/my-distro-devuan-32/deb-installer/scripts/07update-system b/my-distro-devuan-32/deb-installer/scripts/07update-system index 81b6dfc..79111a6 100755 --- a/my-distro-devuan-32/deb-installer/scripts/07update-system +++ b/my-distro-devuan-32/deb-installer/scripts/07update-system @@ -1,8 +1,8 @@ #!/bin/sh -e ################################################################################ -# Title: Bldhelper.sh -# Description: Script to build My-distro ISO image +# Title: Update system +# Description: Script to update the system after install # Author: manuel rosa # Date: Outubro 29, 2023 # License: GPL-3.0-or-later diff --git a/my-distro-devuan-64/build.sh b/my-distro-devuan-64/build.sh index ea52e7e..7142845 100755 --- a/my-distro-devuan-64/build.sh +++ b/my-distro-devuan-64/build.sh @@ -251,7 +251,7 @@ mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop -#mkdir -p $build/build/config/includes.chroot/etc/default +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 @@ -264,7 +264,7 @@ 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/grub/grub $build/build/config/includes.chroot/etc/default +cp $build/grub/grub $build/build/config/includes.chroot/etc/default cp $build/deb-installer/scripts/* $build/build/config/includes.installer/usr/lib/finish-install.d cp $build/deb-installer/preseed/* $build/build/config/includes.installer diff --git a/my-distro-devuan-64/deb-installer/preseed/preseed.cfg b/my-distro-devuan-64/deb-installer/preseed/preseed.cfg index d37f511..62e4315 100644 --- a/my-distro-devuan-64/deb-installer/preseed/preseed.cfg +++ b/my-distro-devuan-64/deb-installer/preseed/preseed.cfg @@ -1,23 +1,25 @@ -# SPDX-License-Identifier: GPL-3.0-or-later -# -# SPDX-FileCopyrightText: 2023 PeppermintOS Team (peppermintosteam@proton.me) +################################################################################ +# Title: Preseed.cfg +# Description: This preseed file includes configuration settings for a custom debian-installer iso. +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ -#This preseed file includes configuration settings for a custom debian-installer iso. - -# You can choose to install non-free and contrib software. +### You can choose to install non-free and contrib software. d-i apt-setup/non-free boolean true d-i apt-setup/contrib boolean true d-i apt-setup/non-free-firmware boolean true -# Select which update services to use; define the mirrors to be used. +### Select which update services to use; define the mirrors to be used. # Values shown below are the normal defaults. d-i apt-setup/services-select multiselect security, updates, backports -d-i apt-setup/security_host string deb.devuan.org/merged +d-i apt-setup/security_host string security.debian.org -# Uncomment this to add multiarch configuration for i386 +### Uncomment this to add multiarch configuration for i386 d-i apt-setup/multiarch string i386 -# Remove popularity-contest +### Remove popularity-contest popularity-contest popularity-contest/participate boolean false ### Account setup @@ -25,3 +27,6 @@ popularity-contest popularity-contest/participate boolean false # use sudo). d-i passwd/root-login boolean false +### Keep /etc/default/grub file +d-i grub-pc/default string keep + diff --git a/my-distro-devuan-64/deb-installer/scripts/07final-cleanup b/my-distro-devuan-64/deb-installer/scripts/07final-cleanup index ce68c79..3717444 100755 --- a/my-distro-devuan-64/deb-installer/scripts/07final-cleanup +++ b/my-distro-devuan-64/deb-installer/scripts/07final-cleanup @@ -1,10 +1,12 @@ #!/bin/sh -e -# SPDX-License-Identifier: GPL-3.0-or-later -# -# SPDX-FileCopyrightText: 2023 PeppermintOS Team (peppermintosteam@proton.me) - -# This script removes unwanted software and files after Debian installation. +################################################################################ +# Title: Final cleanup +# Description: This script removes unwanted software and files after Debian installation. +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ # Remove unwanted packages chroot /target apt purge --autoremove -y \ diff --git a/my-distro-devuan-64/deb-installer/scripts/07grub-config b/my-distro-devuan-64/deb-installer/scripts/07grub-config new file mode 100755 index 0000000..0d4611e --- /dev/null +++ b/my-distro-devuan-64/deb-installer/scripts/07grub-config @@ -0,0 +1,35 @@ +#!/bin/sh -e + +################################################################################ +# Title: Grub-config script +# Description: script to configure thr grub defaults +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ + +# This script configures grub defaults after Debian installation. + +# Defines the variables +GRUB_DEFAULT=0 +GRUB_TIMEOUT=5 +GRUB_DISTRIBUTOR="My-distro" +GRUB_CMDLINE_LINUX_DEFAULT="quiet splash" +GRUB_CMDLINE_LINUX="" +GRUB_GFXMODE=1440x900 +GRUB_DISABLE_OS_PROBER=false + +# GRUB configuration file path +GRUB_CONFIG_FILE="/target/etc/default/grub" + +# Modify the GRUB file +sed -i "s/^GRUB_DEFAULT=.*/GRUB_DEFAULT=$GRUB_DEFAULT/" $GRUB_CONFIG_FILE +sed -i "s/^GRUB_TIMEOUT=.*/GRUB_TIMEOUT=$GRUB_TIMEOUT/" $GRUB_CONFIG_FILE +sed -i "s/^GRUB_DISTRIBUTOR=.*/GRUB_DISTRIBUTOR=\"$GRUB_DISTRIBUTOR\"/" $GRUB_CONFIG_FILE +sed -i "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"$GRUB_CMDLINE_LINUX_DEFAULT\"/" $GRUB_CONFIG_FILE +sed -i "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"$GRUB_CMDLINE_LINUX\"/" $GRUB_CONFIG_FILE +sed -i "s/^#GRUB_GFXMODE=.*/GRUB_GFXMODE=$GRUB_GFXMODE/" $GRUB_CONFIG_FILE +sed -i "s/^#GRUB_DISABLE_OS_PROBER=.*/GRUB_DISABLE_OS_PROBER=$GRUB_DISABLE_OS_PROBER/" $GRUB_CONFIG_FILE + +# Run update-grub after modifying the file +chroot /target update-grub diff --git a/my-distro-devuan-64/deb-installer/scripts/07rebuild-icon-caches b/my-distro-devuan-64/deb-installer/scripts/07rebuild-icon-caches new file mode 100755 index 0000000..fe81076 --- /dev/null +++ b/my-distro-devuan-64/deb-installer/scripts/07rebuild-icon-caches @@ -0,0 +1,13 @@ +#!/bin/sh -e + +################################################################################ +# Title: Rebuild icon caches script +# Description: This script rebuilds the icon caches after Debian installation. +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ + +# Rebuild the icon caches +chroot /target find /usr/share/icons -type d -exec gtk-update-icon-cache -f {} \; + diff --git a/my-distro-devuan-64/deb-installer/scripts/07update-system b/my-distro-devuan-64/deb-installer/scripts/07update-system index 81b6dfc..79111a6 100755 --- a/my-distro-devuan-64/deb-installer/scripts/07update-system +++ b/my-distro-devuan-64/deb-installer/scripts/07update-system @@ -1,8 +1,8 @@ #!/bin/sh -e ################################################################################ -# Title: Bldhelper.sh -# Description: Script to build My-distro ISO image +# Title: Update system +# Description: Script to update the system after install # Author: manuel rosa # Date: Outubro 29, 2023 # License: GPL-3.0-or-later diff --git a/scripts/07final-cleanup b/scripts/07final-cleanup deleted file mode 100755 index b94fa56..0000000 --- a/scripts/07final-cleanup +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -e - -################################################################################ -# Title: build-all.sh -# Description: This script removes unwanted software and files after Debian installation. -# Author: manuel rosa -# Date: Outubro 29, 2023 -# License: GPL-3.0-or-later -################################################################################ - -# Remove unwanted packages -chroot /target apt purge --autoremove -y \ - raspi-firmware \ - calamares \ - calamares-settings* - -# Clean unnecessary files -rm -r /target/boot/firmware