-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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
[iso] Switch the ReactOS path to freeldr.sys - Allow ReactOS to boot from a flash rufus usb again #2589
Conversation
9e44851
to
dbdcef5
Compare
a79ce6f
to
df25f75
Compare
899ffc7
to
d1c1da5
Compare
03b5b3f
to
8b2f4c1
Compare
Sorry I had never done commit signing before this so it took a ... few tries to figure out :D |
8b2f4c1
to
068ba80
Compare
Signed-off-by: Justin Miller <justin.miller@reactos.org>
if (img_report.reactos_path[0] == 0) { | ||
if ((safe_stricmp(psz_basename, reactos_name) == 0) || | ||
(safe_stricmp(psz_basename, reactos_old_name) == 0)) | ||
static_strcpy(img_report.reactos_path, psz_fullpath); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since there was a comment suggesting a problem with using freeldr.sys in (probably older?) ReactOS ISOs. Maybe it could make sense to ensure that setupldr.sys is always used whenever it exists, and check for it until it is found or we went through all files on ISO.
if (img_report.reactos_path[0] == 0) { | |
if ((safe_stricmp(psz_basename, reactos_name) == 0) || | |
(safe_stricmp(psz_basename, reactos_old_name) == 0)) | |
static_strcpy(img_report.reactos_path, psz_fullpath); | |
if ((safe_strstr(img_report.reactos_path, reactos_old_name) == NULL) && | |
((safe_stricmp(psz_basename, reactos_name) == 0) || | |
(safe_stricmp(psz_basename, reactos_old_name) == 0))) | |
static_strcpy(img_report.reactos_path, psz_fullpath); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The problem was that freeldr.sys file was absent from livecd, only setupldr was there, but both files have the same content, so it should be fine ...
Now, I should add, that in much older reactors versions (like the 0.3.x ones), setupldr contained only the startup code to start the bootcd usetup, and it was different from the regular freeldr used in the livecd or in a regular ReactOS installation on a HDD.
@archeYR, I'm afraid I'm not planning to add extra searches that cater specifically for ISOs that are unlikely to be used that commonly, such as ISOs that use both Also the way I am planning to rework this PR (to be consistent with what I do elsewhere is): static const char* reactos_name[] = { "setupldr.sys", "freeldr.sys" };
(...)
if (img_report.reactos_path[0] == 0) {
for (i = 0; i < ARRAYSIZE(reactos_name); i++)
if (safe_stricmp(psz_basename, reactos_name[i]) == 0)
static_strcpy(img_report.reactos_path, psz_fullpath);
} This way, if you guys switch the names of the Also, I guess that means it is actually possible to create bootable USB drives from ReactOS ISOs? |
It's okay, I don't care about these old versions that much either.
0.4.15 will include some USB and PnPMgr fixes that allow ReactOS to boot from USB on some real hardware. Also there is a HybridCD build target that has an option to boot ReactOS from RAM disk and it already works reliably. |
Applied, thanks! This will be part of the upcoming 4.6 release. |
reactos/reactos@764881a
Follow this commit rufus no longer works with ReactOS's newer ISOs. This PR just aims to quickly fix this by checking for both setupldr.sys and freeldr.sys.