History

Merge pull request #19 from teh-jazzman/master

Option not to install a bootloader

Juan RP committed 11 years ago

Commit a5e1dab2 parents ca8d1ff 03b9a7b1 file · +3 −1Browse files

Unified · Split

installer.sh.in+3−1
@@ -419,7 +419,7 @@ set_rootpassword() { · 418 unmodified lines
419menu_bootloader() {419menu_bootloader() {
420 while true; do420 while true; do
421 DIALOG --title " Select the disk to install the bootloader" \421 DIALOG --title " Select the disk to install the bootloader" \
422 --menu "$MENULABEL" ${MENUSIZE} $(show_disks)422 --menu "$MENULABEL" ${MENUSIZE} $(show_disks) none "Manage bootloader otherwise"
423 if [ $? -eq 0 ]; then423 if [ $? -eq 0 ]; then
424 set_option BOOTLOADER "$(cat $ANSWER)"424 set_option BOOTLOADER "$(cat $ANSWER)"
425 BOOTLOADER_DONE=1425 BOOTLOADER_DONE=1
@@ -433,6 +433,8 @@ menu_bootloader() { · 7 unmodified lines
433set_bootloader() {433set_bootloader() {
434 local dev=$(get_option BOOTLOADER) grub_args=434 local dev=$(get_option BOOTLOADER) grub_args=
435 435
436 if [ "$dev" = "none" ]; then return; fi
437
436 # Check if it's an EFI system via efivars module.438 # Check if it's an EFI system via efivars module.
437 if [ -n "$EFI_SYSTEM" ]; then439 if [ -n "$EFI_SYSTEM" ]; then
438 grub_args="--target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=void_grub --recheck"440 grub_args="--target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=void_grub --recheck"

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t