Fix issue with OVMF_CODE.fd symlink #1698
Conversation
|
/retest |
On subsequent runs this will fail because the link has already been created, but it still fails the -f test because it's a link not a file. Also check for -L to fix this.
cybertron
force-pushed
the
fix-ovmf-ln
branch
from
67c1871 to
d8b5d79
Compare
|
/retest |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: elfosardo The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
/lgtm |
| @@ -156,7 +156,7 @@ ansible-playbook \ | |||
| # NOTE(elfosardo): /usr/share/OVMF/OVMF_CODE.fd does not exist in the ovmf | |||
| # package anymore, so we need to create a link to that until metal3-dev-env | |||
| # fixes that, probably when switching to UEFI by default | |||
| if ! [[ -f /usr/share/OVMF/OVMF_CODE.fd ]]; then | |||
| if ! [[ -f /usr/share/OVMF/OVMF_CODE.fd || -L /usr/share/OVMF/OVMF_CODE.fd ]]; then | |||
There was a problem hiding this comment.
According to https://linux.die.net/man/1/test you could do
-e FILE
FILE exists
instead of both
-f FILE
FILE exists and is a regular file
and
-L FILE
FILE exists and is a symbolic link (same as -h)
|
@cybertron: The following tests failed, say
Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
On subsequent runs this will fail because the link has already been created, but it still fails the -f test because it's a link not a file. Since we only care about existence and not the specific type of this file, let's just check for existence with -e instead.