Changeset 1878


Ignore:
Timestamp:
Jan 24, 2008, 6:04:44 PM (12 years ago)
Author:
bruno
Message:

fix an issue in the kill procedure

Location:
branches/2.2.5/mondo/src/common
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mondo/src/common/libmondo-archive.c

    r1854 r1878  
    817817        }
    818818#else
     819#ifdef __IA64__
     820        strcpy(bootdev, call_program_and_get_last_line_of_output
     821               ("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
     822#else
    819823        strcpy(bootdev, call_program_and_get_last_line_of_output
    820824               ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
     825#endif
    821826        if (strstr(bootdev, "/dev/cciss/")) {
     827#ifdef __IA64__
     828            strcpy(bootdev, call_program_and_get_last_line_of_output
     829                   ("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
     830#else
    822831            strcpy(bootdev, call_program_and_get_last_line_of_output
    823832                   ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
     833#endif
    824834        }
    825835        if (!bootdev[0]) {
  • branches/2.2.5/mondo/src/common/newt-specific.c

    r1850 r1878  
    355355    run_program_and_log_output(tmp, TRUE);
    356356    if (strlen(tmp) > 0) {
    357         asprintf(&tmp1,"kill %s", tmp);
     357        asprintf(&tmp1,"kill `%s`", tmp);
    358358        run_program_and_log_output(tmp1, TRUE);
    359359        paranoid_free(tmp1);
Note: See TracChangeset for help on using the changeset viewer.