Skip to content
This repository has been archived by the owner on Jul 9, 2020. It is now read-only.

Fixes #20814 - Added insmod regexp, removed test #418

Merged
merged 1 commit into from Aug 31, 2017

Conversation

lzap
Copy link
Member

@lzap lzap commented Aug 31, 2017

So my previous patch actually did not work, test statement searches for local files and not remote files, therefore the file was never sourced. It looks like source command fail silently, so the test statement is not necessary.

But we found a different thing - some grub2 binaries (namely the one we ship in foreman-bootloaders) do not ship with regexp command compiled in and this must be inserted from a module regexp.mod. The insmod statement does that, otherwise the regexp commandd fails silently. We will need to add modules into foreman-bootloaders.

@lzap
Copy link
Member Author

lzap commented Aug 31, 2017

The insmod fails silently if module is not present, so this won't regress.

if [ -f "$configfile" ]; then
source "$configfile"
fi
source "$configfile"
Copy link
Member Author

Choose a reason for hiding this comment

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

@dLobatog watch out when backporting - the if [ -f "$configfile" ]; then was added yesterday but I found it was incorrect. So just ignore that, the only relevant bit here is "insmod regexp"

Copy link
Member

Choose a reason for hiding this comment

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

@lzap We don't do backporting with community templates - they are synced on every minor release

@lzap lzap changed the title Added insmod regexp, removed test Fixes #20814 - Added insmod regexp, removed test Aug 31, 2017
Copy link
Member

@dLobatog dLobatog left a comment

Choose a reason for hiding this comment

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

@lzap Seems reasonable to me, although I haven't tried it, just read some of the BZs associated.

Will we have to do anything when a release of EL7 that fixes the ':' bug?

if [ -f "$configfile" ]; then
source "$configfile"
fi
source "$configfile"
Copy link
Member

Choose a reason for hiding this comment

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

@lzap We don't do backporting with community templates - they are synced on every minor release

@dLobatog dLobatog merged commit 3111089 into theforeman:develop Aug 31, 2017
@dLobatog
Copy link
Member

Thanks @lzap !

@lzap lzap deleted the develop branch September 4, 2017 13:13
@lzap
Copy link
Member Author

lzap commented Sep 4, 2017

Thanks, I can confirm this won't cause any problems, insmod just prints an error if module cannot be found but Grub2 continues execution the next statement.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants