diff options
author | Francis Rowe <info@gluglug.org.uk> | 2016-01-06 15:35:54 +0000 |
---|---|---|
committer | Francis Rowe <info@gluglug.org.uk> | 2016-01-06 15:35:54 +0000 |
commit | d2b9429a11c0c3b92d1139d3f98ea64c99a36394 (patch) | |
tree | c2eaccd0bef414f656c8480d5cd631c556db7025 /resources/grub | |
parent | fda6467630868f8d6dad5128bdd7c2a10c8d4ae7 (diff) | |
download | librebootfr-d2b9429a11c0c3b92d1139d3f98ea64c99a36394.tar.gz librebootfr-d2b9429a11c0c3b92d1139d3f98ea64c99a36394.zip |
grub.cfg: get rid of 1-liners
Diffstat (limited to 'resources/grub')
-rw-r--r-- | resources/grub/config/menuentries/common.cfg | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg index ed217ff6..03d8a11a 100644 --- a/resources/grub/config/menuentries/common.cfg +++ b/resources/grub/config/menuentries/common.cfg @@ -32,7 +32,9 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o # prompt user for passphrase if LUKS header is found cryptomount ahci0 - for j in 1 2 3 4 5 6 7 8 9; do cryptomount ahci0,${j}; done + for j in 1 2 3 4 5 6 7 8 9; do + cryptomount ahci0,${j} + done # 2. Look for user config. If the above routine successfully decrypted a LUKS container, its content # will be searched before everything else for obvious reasons. Regardless of this, the devices' @@ -52,7 +54,9 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o done # 3. Do the same routine again, but for possibly decrypted data this time. switch_to_grub_config crypto0 - for j in 1 2 3 4 5 6 7 8 9; do switch_to_grub_config "crypto0,${j}"; done + for j in 1 2 3 4 5 6 7 8 9; do + switch_to_grub_config "crypto0,${j}" + done # 3. Last resort, if none of the above succeeds, all you have is GRUB's shell set root=ahci0,1 @@ -70,7 +74,9 @@ menuentry 'Parse ISOLINUX menu (AHCI) [a]' --hotkey='a' { parse_isolinux_config ahci0 # Look for partitions # GPT allows more than 4 partitions, /boot on /dev/sda7 is quite unlikely but still possible - for j in 1 2 3 4 5 6 7 8 9; do parse_isolinux_config "ahci0,${j}"; done + for j in 1 2 3 4 5 6 7 8 9; do + parse_isolinux_config "ahci0,${j}" + done } menuentry 'Parse ISOLINUX menu (USB) [u]' --hotkey='u' { for i in 0 1; do @@ -78,12 +84,16 @@ menuentry 'Parse ISOLINUX menu (USB) [u]' --hotkey='u' { parse_isolinux_config usb${i} # Look for partitions # GPT allows more than 4 partitions, /boot on /dev/sda7 is quite unlikely but still possible - for j in 1 2 3 4 5 6 7 8 9; do parse_isolinux_config "usb${i},${j}"; done + for j in 1 2 3 4 5 6 7 8 9; do + parse_isolinux_config "usb${i},${j}" + done done } menuentry 'Parse ISOLINUX menu (CD/DVD) [d]' --hotkey='d' { insmod ata - for x in ata0 ahci1; do parse_isolinux_config ${x}; done + for x in ata0 ahci1; do + parse_isolinux_config ${x} + done } menuentry 'Switch to grubtest.cfg [t]' --hotkey='t' { set root=cbfsdisk |