Changeset 145 for trunk


Ignore:
Timestamp:
Nov 29, 2005, 4:16:36 PM (13 years ago)
Author:
bcornec
Message:

merge -r141:144 $SVN_M/branches/2.05

Location:
trunk/mondo/mondo/common
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/mondo/common/libmondo-archive.c

    r127 r145  
    36333633            }
    36343634        }
    3635 /*
    3636       sprintf (tmp,
    3637            "cat %s | grep \"afio: \" | cut -d'\"' -f2 | sort -u | awk '{print \"/\"$0;};' | tr -s '/' '/' | grep -vx \"/afio:.*\" > /tmp/changed.files",
    3638            MONDO_LOGFILE);
    3639       system (tmp);
    3640 */
    36413635        asprintf(&tmp,
    3642                  "sed -n -e 's/afio: //p' %s | grep -vx '/dev/.*' >> /tmp/changed.files",
     3636                 "grep 'afio: ' %s | sed 's/afio: //' | grep -vx '/dev/.*' >> /tmp/changed.files",
    36433637                 MONDO_LOGFILE);
    36443638        system(tmp);
     
    36463640
    36473641        asprintf(&tmp,
    3648                  "sed -n -e 's/star: //p' %s | grep -vx '/dev/.*' >> /tmp/changed.files",
     3642                 "grep 'star: ' %s | sed 's/star: //' | grep -vx '/dev/.*' >> /tmp/changed.files",
    36493643                 MONDO_LOGFILE);
    36503644        system(tmp);
  • trunk/mondo/mondo/common/libmondo-files.c

    r142 r145  
    12331233    }
    12341234    fprintf(fout, "ifconfig lo 127.0.0.1  # config loopback\n");
    1235     fprintf(fout, "ifconfig %s %s # config client\n", nfs_dev,
     1235    fprintf(fout, "ifconfig %s %s   # config client\n", nfs_dev,
    12361236            nfs_client_ipaddr);
    1237     fprintf(fout, "ping -c 1 %s # ping server\n", nfs_server_ipaddr);
     1237    fprintf(fout, "ping -c 1 %s # ping server\n", nfs_server_ipaddr);
    12381238    fprintf(fout, "mount -t nfs -o nolock %s /tmp/isodir\n",
    12391239            bkpinfo->nfs_mount);
Note: See TracChangeset for help on using the changeset viewer.