projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sync trunk.
[reactos.git]
/
boot
/
freeldr
/
freeldr
/
reactos
/
reactos.c
diff --git
a/boot/freeldr/freeldr/reactos/reactos.c
b/boot/freeldr/freeldr/reactos/reactos.c
index
12c8c66
..
22f3771
100644
(file)
--- a/
boot/freeldr/freeldr/reactos/reactos.c
+++ b/
boot/freeldr/freeldr/reactos/reactos.c
@@
-606,6
+606,11
@@
LoadAndBootReactOS(PCSTR OperatingSystemName)
//
if (IniReadSettingByName(SectionId, "Options", value, sizeof(value)))
{
//
if (IniReadSettingByName(SectionId, "Options", value, sizeof(value)))
{
+ //
+ // Append boot-time options
+ //
+ AppendBootTimeOptions(value);
+
//
// Check if a ramdisk file was given
//
//
// Check if a ramdisk file was given
//
@@
-718,12
+723,6
@@
LoadAndBootReactOS(PCSTR OperatingSystemName)
}
else
{
}
else
{
- if (! MachDiskNormalizeSystemPath(SystemPath,
- sizeof(SystemPath)))
- {
- UiMessageBox("Invalid system path");
- return;
- }
/* copy system path into kernel command line */
strcpy(reactos_kernel_cmdline, SystemPath);
}
/* copy system path into kernel command line */
strcpy(reactos_kernel_cmdline, SystemPath);
}