Ticket #7595: installer.patch

File installer.patch, 1.6 KB (added by idefix, 8 years ago)

Fix launching of BootManager when mime database is incomplete

  • src/apps/installer/InstallerWindow.cpp

     
    654654void
    655655InstallerWindow::_LaunchBootman()
    656656{
    657     // TODO: Currently bootman always tries to install to the "first" harddisk.
    658     // If/when it later supports being installed to a certain harddisk, we
    659     // would have to pass it the disk that contains the target partition here.
     657    // TODO: Currently BootManager always tries to install to the "first"
     658    // harddisk. If/when it later supports being installed to a certain
     659    // harddisk, we would have to pass it the disk that contains the target
     660    // partition here.
    660661    if (be_roster->Launch(BOOTMAN_SIG) != B_OK) {
    661662        // Try really hard to launch it. It's very likely that this fails,
    662663        // when we run from the CD and there is only an incomplete mime
    663664        // database for example...
    664665        BPath path;
    665         if (find_directory(B_SYSTEM_BIN_DIRECTORY, &path) != B_OK
    666             || path.Append("bootman") != B_OK) {
    667             path.SetTo("/boot/system/bin/bootman");
     666        if (find_directory(B_SYSTEM_APPS_DIRECTORY, &path) != B_OK
     667            || path.Append("BootManager") != B_OK) {
     668            path.SetTo("/boot/system/apps/BootManager");
    668669        }
    669670        BEntry entry(path.Path());
    670671        entry_ref ref;
    671672        if (entry.GetRef(&ref) != B_OK || be_roster->Launch(&ref) != B_OK) {
    672             BAlert* alert = new BAlert("error", B_TRANSLATE("Bootman, the "
     673            BAlert* alert = new BAlert("error", B_TRANSLATE("BootManager, the "
    673674                "application to configure the Haiku boot menu, could not be "
    674675                "launched."), B_TRANSLATE("OK"));
    675676            alert->Go();