From 59a652cfd80b63a97365b6e140e3f4d865986ff2 Mon Sep 17 00:00:00 2001 From: manuel Date: Wed, 15 Nov 2023 13:07:50 -0100 Subject: [PATCH] =?UTF-8?q?atualizar=20scripts=20de=20constru=C3=A7ao=20e?= =?UTF-8?q?=20adicionar=20modulo=20de=20configura=C3=A7ao=20dp=20grub=20ao?= =?UTF-8?q?=20calamares?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calamares/modules/grubcfg.conf | 79 +++++++++++++++++++ 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 +- .../calamares/modules/grubcfg.conf | 79 +++++++++++++++++++ my-distro-devuan-32/build.sh | 4 +- .../calamares/modules/grubcfg.conf | 79 +++++++++++++++++++ my-distro-devuan-64/build.sh | 4 +- .../calamares/modules/grubcfg.conf | 79 +++++++++++++++++++ 10 files changed, 328 insertions(+), 12 deletions(-) create mode 100644 calamares/modules/grubcfg.conf create mode 100644 my-distro-devuan-32-pae/calamares/modules/grubcfg.conf create mode 100644 my-distro-devuan-32/calamares/modules/grubcfg.conf create mode 100644 my-distro-devuan-64/calamares/modules/grubcfg.conf diff --git a/calamares/modules/grubcfg.conf b/calamares/modules/grubcfg.conf new file mode 100644 index 00000000..93120b67 --- /dev/null +++ b/calamares/modules/grubcfg.conf @@ -0,0 +1,79 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Create, overwrite or update /etc/default/grub in the target system. +# +# Write lines to /etc/default/grub (in the target system) based +# on calculated values and the values set in the *defaults* key +# in this configuration file. +# +# Calculated values are: +# - GRUB_DISTRIBUTOR, branding module, *bootloaderEntryName* (this +# string is sanitized, and see also setting *keep_distributor*) +# - GRUB_ENABLE_CRYPTODISK, based on the presence of filesystems +# that use LUKS +# - GRUB_CMDLINE_LINUX_DEFAULT, adding LUKS setup and plymouth +# support to the kernel. + +--- +# If set to true, always creates /etc/default/grub from scratch even if the file +# already existed. If set to false, edits the existing file instead. +overwrite: true + +# If set to true, prefer to write files in /etc/default/grub.d/ +# rather than the single file /etc/default/grub. If this is set, +# Calamares will write /etc/default/grub.d/00Calamares instead. +prefer_grub_d: false + +# If set to true, an **existing** setting for GRUB_DISTRIBUTOR is +# kept, not updated to the *bootloaderEntryName* from the branding file. +# Use this if the GRUB_DISTRIBUTOR setting in the file is "smart" in +# some way (e.g. uses shell-command substitution). +keep_distributor: false + +# The default kernel params that should always be applied. +# This is an array of strings. If it is unset, the default is +# `["quiet"]`. To avoid the default, explicitly set this key +# to an empty list, `[]`. +kernel_params: [ "quiet" ] + +# Default entries to write to /etc/default/grub if it does not exist yet or if +# we are overwriting it. +# +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" + +# Uncomment this to run os-prober so search for and add other OS +# installations to the grub boot menu +GRUB_DISABLE_OS_PROBER=false + +#Grub theme +GRUB_THEME="/boot/grub/themes/my-distro/theme.txt" + +# Set to true to force defaults to be used even when not overwriting +always_use_defaults: false diff --git a/my-distro-debian-32-pae/build.sh b/my-distro-debian-32-pae/build.sh index b2da35f6..7af37c85 100755 --- a/my-distro-debian-32-pae/build.sh +++ b/my-distro-debian-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 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-32/build.sh b/my-distro-debian-32/build.sh index 6034881b..09f5aa70 100755 --- a/my-distro-debian-32/build.sh +++ b/my-distro-debian-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 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-debian-64/build.sh b/my-distro-debian-64/build.sh index c2f0b4d8..7cd4b102 100755 --- a/my-distro-debian-64/build.sh +++ b/my-distro-debian-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 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/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 64691bf9..f94fd0c1 100755 --- a/my-distro-devuan-32-pae/build.sh +++ b/my-distro-devuan-32-pae/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-pae/calamares/modules/grubcfg.conf b/my-distro-devuan-32-pae/calamares/modules/grubcfg.conf new file mode 100644 index 00000000..93120b67 --- /dev/null +++ b/my-distro-devuan-32-pae/calamares/modules/grubcfg.conf @@ -0,0 +1,79 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Create, overwrite or update /etc/default/grub in the target system. +# +# Write lines to /etc/default/grub (in the target system) based +# on calculated values and the values set in the *defaults* key +# in this configuration file. +# +# Calculated values are: +# - GRUB_DISTRIBUTOR, branding module, *bootloaderEntryName* (this +# string is sanitized, and see also setting *keep_distributor*) +# - GRUB_ENABLE_CRYPTODISK, based on the presence of filesystems +# that use LUKS +# - GRUB_CMDLINE_LINUX_DEFAULT, adding LUKS setup and plymouth +# support to the kernel. + +--- +# If set to true, always creates /etc/default/grub from scratch even if the file +# already existed. If set to false, edits the existing file instead. +overwrite: true + +# If set to true, prefer to write files in /etc/default/grub.d/ +# rather than the single file /etc/default/grub. If this is set, +# Calamares will write /etc/default/grub.d/00Calamares instead. +prefer_grub_d: false + +# If set to true, an **existing** setting for GRUB_DISTRIBUTOR is +# kept, not updated to the *bootloaderEntryName* from the branding file. +# Use this if the GRUB_DISTRIBUTOR setting in the file is "smart" in +# some way (e.g. uses shell-command substitution). +keep_distributor: false + +# The default kernel params that should always be applied. +# This is an array of strings. If it is unset, the default is +# `["quiet"]`. To avoid the default, explicitly set this key +# to an empty list, `[]`. +kernel_params: [ "quiet" ] + +# Default entries to write to /etc/default/grub if it does not exist yet or if +# we are overwriting it. +# +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" + +# Uncomment this to run os-prober so search for and add other OS +# installations to the grub boot menu +GRUB_DISABLE_OS_PROBER=false + +#Grub theme +GRUB_THEME="/boot/grub/themes/my-distro/theme.txt" + +# Set to true to force defaults to be used even when not overwriting +always_use_defaults: false diff --git a/my-distro-devuan-32/build.sh b/my-distro-devuan-32/build.sh index b8659efe..5a9fa065 100755 --- a/my-distro-devuan-32/build.sh +++ b/my-distro-devuan-32/build.sh @@ -252,7 +252,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 @@ -266,7 +266,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/calamares/modules/grubcfg.conf b/my-distro-devuan-32/calamares/modules/grubcfg.conf new file mode 100644 index 00000000..93120b67 --- /dev/null +++ b/my-distro-devuan-32/calamares/modules/grubcfg.conf @@ -0,0 +1,79 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Create, overwrite or update /etc/default/grub in the target system. +# +# Write lines to /etc/default/grub (in the target system) based +# on calculated values and the values set in the *defaults* key +# in this configuration file. +# +# Calculated values are: +# - GRUB_DISTRIBUTOR, branding module, *bootloaderEntryName* (this +# string is sanitized, and see also setting *keep_distributor*) +# - GRUB_ENABLE_CRYPTODISK, based on the presence of filesystems +# that use LUKS +# - GRUB_CMDLINE_LINUX_DEFAULT, adding LUKS setup and plymouth +# support to the kernel. + +--- +# If set to true, always creates /etc/default/grub from scratch even if the file +# already existed. If set to false, edits the existing file instead. +overwrite: true + +# If set to true, prefer to write files in /etc/default/grub.d/ +# rather than the single file /etc/default/grub. If this is set, +# Calamares will write /etc/default/grub.d/00Calamares instead. +prefer_grub_d: false + +# If set to true, an **existing** setting for GRUB_DISTRIBUTOR is +# kept, not updated to the *bootloaderEntryName* from the branding file. +# Use this if the GRUB_DISTRIBUTOR setting in the file is "smart" in +# some way (e.g. uses shell-command substitution). +keep_distributor: false + +# The default kernel params that should always be applied. +# This is an array of strings. If it is unset, the default is +# `["quiet"]`. To avoid the default, explicitly set this key +# to an empty list, `[]`. +kernel_params: [ "quiet" ] + +# Default entries to write to /etc/default/grub if it does not exist yet or if +# we are overwriting it. +# +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" + +# Uncomment this to run os-prober so search for and add other OS +# installations to the grub boot menu +GRUB_DISABLE_OS_PROBER=false + +#Grub theme +GRUB_THEME="/boot/grub/themes/my-distro/theme.txt" + +# Set to true to force defaults to be used even when not overwriting +always_use_defaults: false diff --git a/my-distro-devuan-64/build.sh b/my-distro-devuan-64/build.sh index 3722aa62..85708000 100755 --- a/my-distro-devuan-64/build.sh +++ b/my-distro-devuan-64/build.sh @@ -252,7 +252,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/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/calamares/modules/grubcfg.conf b/my-distro-devuan-64/calamares/modules/grubcfg.conf new file mode 100644 index 00000000..93120b67 --- /dev/null +++ b/my-distro-devuan-64/calamares/modules/grubcfg.conf @@ -0,0 +1,79 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Create, overwrite or update /etc/default/grub in the target system. +# +# Write lines to /etc/default/grub (in the target system) based +# on calculated values and the values set in the *defaults* key +# in this configuration file. +# +# Calculated values are: +# - GRUB_DISTRIBUTOR, branding module, *bootloaderEntryName* (this +# string is sanitized, and see also setting *keep_distributor*) +# - GRUB_ENABLE_CRYPTODISK, based on the presence of filesystems +# that use LUKS +# - GRUB_CMDLINE_LINUX_DEFAULT, adding LUKS setup and plymouth +# support to the kernel. + +--- +# If set to true, always creates /etc/default/grub from scratch even if the file +# already existed. If set to false, edits the existing file instead. +overwrite: true + +# If set to true, prefer to write files in /etc/default/grub.d/ +# rather than the single file /etc/default/grub. If this is set, +# Calamares will write /etc/default/grub.d/00Calamares instead. +prefer_grub_d: false + +# If set to true, an **existing** setting for GRUB_DISTRIBUTOR is +# kept, not updated to the *bootloaderEntryName* from the branding file. +# Use this if the GRUB_DISTRIBUTOR setting in the file is "smart" in +# some way (e.g. uses shell-command substitution). +keep_distributor: false + +# The default kernel params that should always be applied. +# This is an array of strings. If it is unset, the default is +# `["quiet"]`. To avoid the default, explicitly set this key +# to an empty list, `[]`. +kernel_params: [ "quiet" ] + +# Default entries to write to /etc/default/grub if it does not exist yet or if +# we are overwriting it. +# +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" + +# Uncomment this to run os-prober so search for and add other OS +# installations to the grub boot menu +GRUB_DISABLE_OS_PROBER=false + +#Grub theme +GRUB_THEME="/boot/grub/themes/my-distro/theme.txt" + +# Set to true to force defaults to be used even when not overwriting +always_use_defaults: false