Changeset 3350


Ignore:
Timestamp:
Feb 27, 2015, 3:14:40 PM (5 years ago)
Author:
Bruno Cornec
Message:
  • Fix #769 by asking in newt mode whether the kernel found by mindi is the one the sysadmin want's to use
Location:
branches/3.2/mondo/src/common
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mondo/src/common/libmondo-devices.c

    r3348 r3350  
    27552755            bkpinfo->zip_exe[0] = bkpinfo->zip_suffix[0] = '\0';
    27562756        }
     2757#if __FreeBSD__ == 5
     2758        strcpy(bkpinfo->kernel_path, "/boot/kernel/kernel");
     2759#elif __FreeBSD__ == 4
     2760        strcpy(bkpinfo->kernel_path, "/kernel");
     2761#elif linux
     2762        if (figure_out_kernel_path_interactively_if_necessary(bkpinfo->kernel_path)) {
     2763            fatal_error("Kernel not found. Please specify manually with the '-k' switch.");
     2764        }
     2765#else
     2766#error "I don't know about this system!"
     2767#endif
     2768
    27572769
    27582770        bkpinfo->verify_data =
  • branches/3.2/mondo/src/common/libmondo-files.c

    r3292 r3350  
    2929extern int g_currentY;
    3030extern char *g_mondo_home;
     31
     32extern bool g_text_mode;
    3133
    3234/* Reference to global bkpinfo */
     
    288290        mr_free(tmp);
    289291        mr_free(command);
    290     }
     292    } else {
     293        // If we've found the kernel, allow sysadmin to modify it if he wants
     294        if (!g_text_mode) {
     295            if (!popup_and_get_string("Kernel path", "We found this full path name for your kernel. You should just use it in most cases", kernel, MAX_STR_LEN / 4)) {
     296                fatal_error("Kernel not found. Please specify with the '-k' flag.");
     297            }
     298        }
     299    }
     300    log_it("User says kernel is at %s", kernel);
     301
    291302    log_it("Calling Mindi with kernel path of '%s'", kernel);
    292303    while (!kernel[0]) {
Note: See TracChangeset for help on using the changeset viewer.