Ignore:
Timestamp:
Aug 8, 2006, 12:34:37 AM (14 years ago)
Author:
Bruno Cornec
Message:

merge -r728:763 $SVN_M/branches/stable

Location:
trunk/mondo/mondo/mondorestore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/mondo/mondorestore/mondo-prep.c

    r729 r764  
    21902190#else
    21912191    asprintf(&program, "raidstart %s", raid_device);
    2192 //      sprintf (program, "raidstart " RAID_DEVICE_STUB "*");
    21932192#endif
    21942193    log_msg(1, "program = %s", program);
  • trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c

    r729 r764  
    883883    static int lines_in_flist_window = 0;
    884884    static int depth = 0;
    885     int i = 0;
     885
     886    /** long **************************************************************/
     887    long i = 0;
    886888
    887889    /** structures *******************************************************/
     
    13631365    paranoid_free(size_str);
    13641366
    1365     newtListboxSetEntry(listbox, (int) keylist[currline],
     1367    newtListboxSetEntry(listbox, (long) keylist[currline],
    13661368                        mountlist_entry_to_string(mountlist, currline));
    13671369    /* if new /dev/md RAID device then do funky stuff */
     
    24892491{
    24902492
    2491     /** int *************************************************************/
    2492     int i = 0;
     2493    /** long **************************************************************/
     2494    long i = 0;
    24932495
    24942496    assert(disklist != NULL);
     
    25212523{
    25222524
    2523     /** int **************************************************************/
    2524     int i = 0;
     2525    /** long **************************************************************/
     2526    long i = 0;
    25252527
    25262528    assert(mountlist != NULL);
     
    25542556{
    25552557
    2556     /** int **************************************************************/
    2557     int i = 0;
     2558    /** long *************************************************************/
     2559    long i = 0;
    25582560
    25592561    /** buffers **********************************************************/
     
    25902592                void *keylist[], newtComponent listbox)
    25912593{
    2592     /** int *************************************************************/
    2593     int i = 0;
     2594    /** long ************************************************************/
     2595    long i = 0;
    25942596
    25952597    /** buffers *********************************************************/
  • trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

    r729 r764  
    21552155    asprintf(&command, "mount /dev/fd0u1722 %s", mountpt);
    21562156    asprintf(&tmp,
    2157             "(sleep 15; kill `ps ax | grep \"%s\" | cut -d' ' -f1` 2> /dev/null) &",
     2157            "(sleep 15; kill `ps | grep \"%s\" | cut -d' ' -f1` 2> /dev/null) &",
    21582158            command);
    21592159    log_msg(1, "tmp = '%s'", tmp);
Note: See TracChangeset for help on using the changeset viewer.