Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Blind attempt to clean up 630_run_efibootmgr.sh (issue 1942) #1945

Merged
merged 1 commit into from Nov 22, 2018

Conversation

jsmeix
Copy link
Member

@jsmeix jsmeix commented Oct 30, 2018

  • Type: Enhancement Cleanup

  • Impact: Normal

  • Reference to related issue (URL):
    Support EFISTUB booting (e.g. on Arch Linux) #1942

  • How was this pull request tested?
    Not at all because currently I do not use UEFI on my test systems

  • Brief description of the changes in this pull request:
    A blind cleanup attempt by plain looking at the code
    which is intended as a proposal how I think 630_run_efibootmgr.sh
    could be enhanced and cleaned up in general:

Determine the ESP mountpoint from the UEFI_BOOTLOADER value
and use $TARGET_FS_ROOT/boot/efi as fallback so that there is
(hopefully) no longer the need to error out.

Corrected the logic at the end whether or not NOBOOTLOADER is set empty.

Skip what it does when UEFI_BOOTLOADER is empty or not a regular file.

A bit more verbose messages what is going on.

@jsmeix jsmeix added enhancement Adaptions and new features cleanup labels Oct 30, 2018
@jsmeix jsmeix added this to the ReaR v2.5 milestone Oct 30, 2018
@jsmeix jsmeix self-assigned this Oct 30, 2018
@jsmeix jsmeix requested review from gdha and gozora October 30, 2018 10:10
@gozora
Copy link
Member

gozora commented Oct 30, 2018

Cloning this right ahead and use it for my upcoming tests.
I'll keep you posted.

V.

Copy link
Member

@gozora gozora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've used new version several times, while working on EFISTUB support and it works good!
With old code:

[[ -d "$TARGET_FS_ROOT/boot/efi" ]]
StopIfError "Could not find directory $TARGET_FS_ROOT/boot/efi"

EFISTUB will just end with error ...

V.

@jsmeix
Copy link
Member Author

jsmeix commented Nov 22, 2018

Approved blind attempts of me get merged istantly by me ;-)

@gdha
I like to merge it today afternoon if you do not object.

@jsmeix jsmeix merged commit 14bfcd4 into rear:master Nov 22, 2018
@jsmeix jsmeix deleted the cleanup_630_run_efibootmgr_issue_1942 branch November 22, 2018 13:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants