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

bsdinstall: fix ps3 regression #1594

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

aomsin2526
Copy link
Contributor

b6644f5 introduces FREEBSD_BOOTLABEL="FreeBSD" as default value but cc42ef5 removed this line, expecting it to be set by update_uefi_bootentry()

But ps3 don't use this function so its broken completely.

So we add this line back.

Example /boot/etc/kboot.conf

Bad:

default=
='/kernel/kernel kernelname=/boot/kernel/kernel vfs.root.mountfrom=ufs:/dev/da1s2a'

Good:

default=FreeBSD
FreeBSD='/kernel/kernel kernelname=/boot/kernel/kernel vfs.root.mountfrom=ufs:/dev/da1s2a'

@jlduran
Copy link
Member

jlduran commented Feb 7, 2025

Why not using:

FREEBSD_BOOTLABEL=$OSNAME

But after sourcing $BSDCFG_SHARE/common.subr:

. $BSDCFG_SHARE/common.subr || exit 1

@aomsin2526 aomsin2526 force-pushed the main-ps3-bsdinstall-fix branch from 22ae9c2 to 4fdaf77 Compare February 7, 2025 21:26
@aomsin2526
Copy link
Contributor Author

Why not using:

FREEBSD_BOOTLABEL=$OSNAME

But after sourcing $BSDCFG_SHARE/common.subr:

. $BSDCFG_SHARE/common.subr || exit 1

Fixed thanks!

@jlduran
Copy link
Member

jlduran commented Feb 7, 2025

That should work right?

Aesthetically, I would have placed it closer to TMPDIR, but that is just nitpicking.

b6644f5 introduces FREEBSD_BOOTLABEL="FreeBSD" as default value
but cc42ef5 removed this line, expecting it to be set by update_uefi_bootentry()

But ps3 don't use this function so its broken completely.

So we add this line back.

Signed-off-by: Chattrapat Sangmanee <[email protected]>
@aomsin2526 aomsin2526 force-pushed the main-ps3-bsdinstall-fix branch from 4fdaf77 to fcee668 Compare February 7, 2025 21:32
@aomsin2526
Copy link
Contributor Author

aomsin2526 commented Feb 7, 2025

I think it should work. I tested my original code and it work fine. I will test this new one tomorrow.

Edit: Tested and it works!

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

Successfully merging this pull request may close these issues.

2 participants