From dea1077d4107a9aaa1390a58d9151cabf5e621b7 Mon Sep 17 00:00:00 2001
From: livio <livio@codeberg.org>
Date: Wed, 3 Apr 2024 16:38:57 +0200
Subject: [PATCH] Changed and improved some output messages and code
indentation.
---
config/grub/config/mdet.cfg | 37 ++++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 17 deletions(-)
diff --git a/config/grub/config/mdet.cfg b/config/grub/config/mdet.cfg
index 6a81dc58..95c2462a 100644
--- a/config/grub/config/mdet.cfg
+++ b/config/grub/config/mdet.cfg
@@ -9,17 +9,17 @@ function list_pmedia {
unset tgt_medias
for media_item in ${media_devlist}; do
for device_kind in ${1}; do
- for num in $medianums; do
- # If media number is an existent detected media
- if [ $media_item == "($device_kind$num)" ]; then
- # Add raw media
- tgt_medias="${tgt_medias} (${device_kind}${num})"
- # Add every possible partition
- for part in ${partnums}; do
- tgt_medias="${tgt_medias} (${device_kind}${num},${part})"
- done
- fi
- done
+ for num in $medianums; do
+ # If media number is an existent detected media
+ if [ $media_item == "($device_kind$num)" ]; then
+ # Add raw media
+ tgt_medias="${tgt_medias} (${device_kind}${num})"
+ # Add every possible partition
+ for part in ${partnums}; do
+ tgt_medias="${tgt_medias} (${device_kind}${num},${part})"
+ done
+ fi
+ done
done
done
#echo $tgt_medias
@@ -63,30 +63,31 @@ function make_boot_menus {
fi
echo -n "."
done
- echo
}
# Scan every physical media to make boot menus
function scan_p_media_menus {
for i in ata ahci usb crypto fd; do
- echo -n "Scanning ${i}"
+ echo -n "${i}: searching..."
list_pmedia ${i}
make_boot_menus
+ echo "done."
done
}
# Scan every logical media to make boot menus
function scan_l_media_menus {
for i in lvm md; do
- echo -n "Scanning ${i}"
+ echo -n "${i}: searching..."
list_lmedia ${i}
make_boot_menus
+ echo "done."
done
}
# Creates a menuentry for GRUB. First argument is menu text without spaces then root and configfile
function grub_menuentry {
- menuentry "Boot GRUB from $1" ${1} ${2} ${3} {
+ menuentry "$1: Boot GRUB" ${1} ${2} ${3} {
set root="${2}"
unset superusers
configfile ${3}
@@ -109,7 +110,7 @@ function grub_create_menu {
# Creates a menuentry for ISOLINUX. First argument is menu text without spaces then root and configfile
function isolinux_menuentry {
- menuentry "Boot ISOLINUX from $1" ${1} ${2} ${3} {
+ menuentry "$1: Boot ISOLINUX" ${1} ${2} ${3} {
set root="${2}"
syslinux_configfile -i ${3}
}
@@ -117,7 +118,7 @@ function isolinux_menuentry {
# Pretty same as above function
function syslinux_menuentry {
- menuentry "Boot SYSLINUX from $1" ${1} ${2} ${3} {
+ menuentry "$1: Boot SYSLINUX" ${1} ${2} ${3} {
set root="${2}"
syslinux_configfile -s ${3}
}
@@ -141,7 +142,9 @@ function isolinux_create_menu {
done
}
+echo "Detecting medias..."
mediadetect
+echo "Attempting to unlock encrypted medias... (Press ENTER without typing password to skip)"
cryptomount -a
scan_p_media_menus
scan_l_media_menus
--
GitLab