Skip to content
Snippets Groups Projects
Commit dea1077d authored by livio's avatar livio Committed by Libreboot project
Browse files

Changed and improved some output messages and code indentation.

parent 89cbda74
Branches
No related tags found
No related merge requests found
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment