Changeset 1130


Ignore:
Timestamp:
Feb 10, 2007, 3:28:05 PM (13 years ago)
Author:
bruno
Message:

Fix trunk transfer errors to libmondo-devices.c

File:
1 edited

Legend:

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

    r1129 r1130  
    993993                gotgeo = 1;
    994994            } else {
    995                 mr_msg(1,
    996                         "Error in ioctl() getting new hard disk geometry (%s), resizing in unsafe mode",
    997                         strerror(errno));
     995                mr_msg(1, "Harddisk geometry wrong");
     996            }
     997        } else {
     998            mr_msg(1,
     999                    "Error in ioctl() getting new hard disk geometry (%s), resizing in unsafe mode", strerror(errno));
    9981000            }
    9991001            close(fileid);
     
    11461148        {
    11471149            paranoid_pclose(fin);
     1150            mr_free(incoming);
    11481151            return(TRUE);
    11491152        }
     
    13121315    return (retval);
    13131316}
    1314 
    1315 
    1316 
    1317 
    13181317
    13191318
     
    20242023}
    20252024
     2025
    20262026/**
    20272027 * @addtogroup utilityGroup
     
    20552055
    20562056
    2057 
    2058 
    20592057/**
    20602058 * Get a space-separated list of NFS mounts.
     
    20822080    return (result_sz);
    20832081}
    2084 
    20852082/* @} - end of utilityGroup */
    2086 
    2087 
    2088 
    20892083
    20902084
     
    21112105    mr_free(tmp);
    21122106}
    2113 
    2114 
    2115 
    2116 
    21172107
    21182108
     
    21692159
    21702160
    2171 
    2172 
    2173 
    2174 
    21752161/**
    21762162 * @addtogroup deviceGroup
     
    22132199    }
    22142200}
    2215 
    2216 
    2217 
    22182201
    22192202
     
    23072290 * @note Under Linux, all drives are examined, not just @p which_device.
    23082291 */
     2292char which_boot_loader(char *which_device)
     2293{
    23092294#ifdef __FreeBSD__
    2310 char which_boot_loader(char *which_device)
    2311 {
    23122295    int count_lilos = 0;
    23132296    int count_grubs = 0;
     
    23482331        return ('U');
    23492332    }
    2350 }
    2351 
    23522333#else
    2353 
    2354 char which_boot_loader(char *which_device)
    2355 {
    23562334    /*@ buffer ***************************************************** */
    23572335    char *list_drives_cmd;
     
    24162394        return ('U');
    24172395    }
    2418 }
    2419 #endif
     2396#endif
     2397}
    24202398
    24212399
     
    25432521    return(output);
    25442522}
    2545 
    25462523/* @} - end of deviceGroup */
Note: See TracChangeset for help on using the changeset viewer.