Ignore:
Timestamp:
Apr 10, 2008, 1:13:58 AM (11 years ago)
Author:
bruno
Message:

merge -r 1842:1889 2.2.5

File:
1 edited

Legend:

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

    r1770 r1903  
    4242#define DVDRWFORMAT 1
    4343
    44 #ifndef __FreeBSD__
    4544#ifndef _SEMUN_H
    4645#define _SEMUN_H
     
    5655};
    5756#endif
    58 #endif                          /* __FreeBSD__ */
    5957
    6058extern struct mr_ar_conf *mr_conf;
     
    615613        }
    616614#else
     615#ifdef __IA64__
     616        strcpy(bootdev, call_program_and_get_last_line_of_output
     617               ("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
     618#else
    617619        strcpy(bootdev, call_program_and_get_last_line_of_output
    618620               ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
     621#endif
    619622        if (strstr(bootdev, "/dev/cciss/")) {
     623#ifdef __IA64__
     624            strcpy(bootdev, call_program_and_get_last_line_of_output
     625                   ("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
     626#else
    620627            strcpy(bootdev, call_program_and_get_last_line_of_output
    621628                   ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
     629#endif
    622630        }
    623631        if (!bootdev[0]) {
     
    31923200    /*@ bool ******************************************************** */
    31933201    bool that_one_was_ok;
    3194     bool using_nfs;
    31953202    bool orig_vfy_flag_val;
    31963203
     
    32043211    }
    32053212
    3206     if (strlen(bkpinfo->nfs_mount) > 1) {
    3207         using_nfs = TRUE;
    3208     } else {
    3209         using_nfs = FALSE;
    3210     }
    32113213    mr_msg(1, "OK, time to make %s #%d",
    32123214            bkpinfo->backup_media_string,
Note: See TracChangeset for help on using the changeset viewer.