V8.00.000.2025.06.17
Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
@@ -28,7 +28,7 @@ check_fstab() {
|
||||
chroot_logger "${TARGET}${var_logfile}"
|
||||
|
||||
# shellcheck disable=SC2016 # an Internal script is only evaluated in chroot.
|
||||
do_in_target_script "${TARGET}" '
|
||||
chroot_script "${TARGET}" '
|
||||
export INITRD=No
|
||||
|
||||
if [[ ! -s /etc/fstab ]]; then
|
||||
|
||||
@@ -30,7 +30,7 @@ installation_cryptsetup() {
|
||||
|
||||
chroot_logger "${TARGET}${var_logfile}"
|
||||
|
||||
do_in_target_script "${TARGET}" '
|
||||
chroot_script "${TARGET}" '
|
||||
export INITRD=No
|
||||
apt-get install -y --no-install-recommends --no-install-suggests cryptsetup cryptsetup-initramfs 2>&1 | tee -a '"${var_logfile}"'
|
||||
echo ExitCode: $? >> '"${var_logfile}"'
|
||||
|
||||
@@ -73,7 +73,7 @@ installation_grub() {
|
||||
case "${VAR_ARCHITECTURE}" in
|
||||
|
||||
amd64)
|
||||
do_in_target_script "${TARGET}" "
|
||||
chroot_script "${TARGET}" "
|
||||
export INITRD=No
|
||||
apt-get install -y --no-install-recommends grub2-common grub-efi-amd64 grub-efi-amd64-bin 2>&1 | tee -a ${var_logfile}
|
||||
echo ExitCode: \$? >> ${var_logfile}
|
||||
@@ -81,7 +81,7 @@ installation_grub() {
|
||||
;;
|
||||
|
||||
arm64)
|
||||
do_in_target_script "${TARGET}" "
|
||||
chroot_script "${TARGET}" "
|
||||
export INITRD=No
|
||||
apt-get install -y --no-install-recommends grub2-common grub-efi-arm64 grub-efi-arm64-bin 2>&1 | tee -a ${var_logfile}
|
||||
echo ExitCode: \$? >> ${var_logfile}
|
||||
@@ -96,7 +96,7 @@ installation_grub() {
|
||||
|
||||
else
|
||||
|
||||
do_in_target_script "${TARGET}" "
|
||||
chroot_script "${TARGET}" "
|
||||
export INITRD=No
|
||||
apt-get install -y --no-install-recommends grub2-common grub-pc grub-pc-bin 2>&1 | tee -a ${var_logfile}
|
||||
echo ExitCode: \$? >> ${var_logfile}
|
||||
@@ -139,7 +139,7 @@ EOF
|
||||
### Change the GRUB OS detection configuration accordingly.
|
||||
if [[ "${grub_prober}" == "true" ]]; then
|
||||
|
||||
do_in_target "${TARGET}" export INITRD=No; apt-get install -y --no-install-recommends os-prober
|
||||
chroot_exec "${TARGET}" export INITRD=No; apt-get install -y --no-install-recommends os-prober
|
||||
|
||||
cat << EOF >> "${TARGET}/etc/default/grub"
|
||||
# If your computer has multiple operating systems installed, then you
|
||||
@@ -187,7 +187,7 @@ EOF
|
||||
|
||||
fi
|
||||
|
||||
[[ "${var_update_grub_required}" == "true" ]] && do_in_target "${TARGET}" update-grub
|
||||
[[ "${var_update_grub_required}" == "true" ]] && chroot_exec "${TARGET}" update-grub
|
||||
|
||||
if [[ "${grub_force_efi}" == "true" ]]; then
|
||||
|
||||
@@ -243,7 +243,7 @@ install_grub_bios() {
|
||||
|
||||
ary_bios_arg+=( --target=i386-pc --boot-directory=/boot "--modules=${var_bios_mod}" )
|
||||
|
||||
do_in_target "${TARGET}" grub-install "${ary_bios_arg[@]}" "${grub_bootdev}"
|
||||
chroot_exec "${TARGET}" grub-install "${ary_bios_arg[@]}" "${grub_bootdev}"
|
||||
do_log "info" "file_only" "4230() Installed: GRUB on Device: '${grub_bootdev}' [BIOS]."
|
||||
var_update_grub_required="true"
|
||||
|
||||
@@ -290,7 +290,7 @@ install_grub_uefi() {
|
||||
|
||||
[[ "${grub_update_nvram}" == "false" ]] && ary_uefi_arg+=( --no-nvram )
|
||||
|
||||
do_in_target "${TARGET}" grub-install "${ary_uefi_arg[@]}" "${grub_bootdev}" || return "${ERR_GRUB_INSTALL}"
|
||||
chroot_exec "${TARGET}" grub-install "${ary_uefi_arg[@]}" "${grub_bootdev}" || return "${ERR_GRUB_INSTALL}"
|
||||
do_log "info" "file_only" "4230() Installed: GRUB on Device: '${grub_bootdev}' [UEFI]."
|
||||
var_update_grub_required="true"
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ update_grub_password() {
|
||||
} >> "${var_of}"
|
||||
fi
|
||||
|
||||
do_in_target "${TARGET}" update-grub
|
||||
chroot_exec "${TARGET}" update-grub
|
||||
|
||||
guard_dir && return 0
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@ update_grub_bootparameter() {
|
||||
|
||||
grub_finalize_string
|
||||
|
||||
do_in_target "${TARGET}" update-grub
|
||||
chroot_exec "${TARGET}" update-grub
|
||||
|
||||
guard_dir && return 0
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user