Changeset 794


Ignore:
Timestamp:
Sep 14, 2006, 1:05:18 AM (13 years ago)
Author:
bruno
Message:

merge -r781:793 $SVN_M/branches/stable

Location:
trunk
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/README

    r764 r794  
    5050
    5151Apart from the above-mentioned documentation, there is a Wiki with growing
    52 contents at the following URL: http://www.mondorescue.org/cgi-bin/trac.cgi/wiki
     52contents at the following URL: http://trac.mondorescue.org
    5353
    5454Also, there is a mailing list mondo-devel@lists.sourceforge.net. Please go to
  • trunk/mindi/mindi

    r782 r794  
    14591459            fi
    14601460
    1461             # 4th try : pre-formated LABEL. Format is : LABEL=SWAP-mydevice. e.g. : LABEL=SWAP-hda5
     1461            # 4th try : pre-formated LABEL. Format is : LABEL=SWAP-mydevice or SW-mydevice. e.g. : LABEL=SWAP-hda5
     1462            # LABEL=SW-cciss/c0d0p3 (RDP)
    14621463            # SWAP only
    1463             if [ "x$actual_dev" = "x" -a  _"`echo $current_partition | /bin/grep -i 'LABEL=SWAP'`" != _"" ]; then
     1464            if [ "x$actual_dev" = "x" -a  _"`echo $current_partition | /bin/grep -iE 'LABEL=SWAP|LABEL=SW-'`" != _"" ]; then
    14641465                try_dev="`echo "$redhat_label" | /bin/cut -d '-' -f2`"
    14651466                present_dev="`/bin/cat /proc/swaps | /bin/grep -w /dev/$try_dev`"
     
    14971498            current_lvolume="`find /dev -lname "$current_partition" | grep -Ev '^/dev/\.static/'`"
    14981499            echo $current_lvolume | grep -q ' '
    1499             if [ $? -eq 0]; then
     1500            if [ $? -eq 0 ]; then
    15001501                echo "WARNING: Multiple Logical Volumes found. Report to dev team" >> $LOGFILE 
    15011502            fi
  • trunk/mondo-doc/mondoarchive.8

    r729 r794  
    160160.TP
    161161.BI "-J " "file"
    162 Specify an explicit list of files and directories in a plain text file, one item
    163 (file or directory) per line.
     162Specify an explicit list of files and directories to include in a plain text file, one item
     163(file or directory) per line. Beware that directories placed in that file are not managed recursively contrary to what is done with the -I option.
    164164
    165165.TP
    166166.BI "-N"
    167 Exclude all mounted network filesystems. This currently means NFS, SMB, Coda
     167Exclude all mounted network filesystems. This currently means NFS, SMB, Coda, MVFS, AFS
    168168and Netware. In other words, only backup the local hard disk(s).
    169169
  • trunk/mondo/ChangeLog

    r788 r794  
    33MONDO CHANGES
    44
    5 3.0.0 (2006-08-30)
     53.0.0 (2006-09-30)
    66- indent on source files
    77- asprintf used instead of malloc_string + sprintf/strcpy/strcat without verifications. Optimisations on memory consumption (allocate only size needed + remove memory leaks) (Bruno Cornec)
    88- Internationalization (A huge thank to rene-marc dolhen <rmd_at_mecreant.org> who achieved that big task)
     9
     102.2.0 (2006-09-05)
    911
    10122.0.9 (2006-08-04)
  • trunk/mondo/README

    r764 r794  
    5050
    5151Apart from the above-mentioned documentation, there is a Wiki with growing
    52 contents at the following URL: http://www.mondorescue.org/cgi-bin/trac.cgi/wiki
     52contents at the following URL: http://trac.mondorescue.org
    5353
    5454Also, there is a mailing list mondo-devel@lists.sourceforge.net. Please go to
  • trunk/mondo/mondo/common/libmondo-devices.c

    r783 r794  
    20242024{
    20252025    return(call_program_and_get_last_line_of_output
    2026            ("mount -t coda,ncpfs,nfs,smbfs,cifs,mvfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
     2026           ("mount -t coda,ncpfs,nfs,smbfs,cifs,afs,mvfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
    20272027    /* BERLIOS : Useless
    20282028    asprintf(&exclude_these_devices,
    20292029           call_program_and_get_last_line_of_output
    2030            ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|mvfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
     2030           ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|afs|mvfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
    20312031           */
    20322032}
     
    20522052#ifdef __FreeBSD__
    20532053    tmp = call_program_and_get_last_line_of_output
    2054            ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs,mvfs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'");
     2054           ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs,afs,mvfs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'");
    20552055#else
    20562056    tmp = call_program_and_get_last_line_of_output
    2057            ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs -x mvfs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'");
     2057           ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs -x afs -x mvfs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'");
    20582058#endif
    20592059
  • trunk/mondo/mondo/common/libmondo-fifo.c

    r688 r794  
    5555/* @} - end of globalGroup */
    5656
     57extern char *ps_options;
    5758
    5859/**
     
    129130    }
    130131    sleep(2);
    131     asprintf(&tmp, "ps wwax | grep \"%s\"", g_sz_call_to_buffer);
     132    asprintf(&tmp, "ps %s | grep \"%s\"", ps_options, g_sz_call_to_buffer);
    132133    if (run_program_and_log_output(tmp, 2)) {
    133134        log_msg(2, "Warning - I think I failed to open tape, actually.");
     
    135136    paranoid_free(tmp);
    136137    g_tape_buffer_size_MB = bufsize;
    137     /* BERLIOS: usless ?
    138        strcmp(tmp, g_sz_call_to_buffer);
    139        tmp[30] = '\0';
    140      */
    141     asprintf(&tmp, "ps wwax | grep buffer | grep -v grep");
     138    asprintf(&tmp, "ps %s | grep buffer | grep -v grep", ps_options);
    142139    if (run_program_and_log_output(tmp, 1)) {
    143140        fres = NULL;
     
    161158    sync();
    162159    asprintf(&command,
    163             "ps wwax | grep -F \"%s\" | grep -Fv grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'",
     160            "ps | grep -F \"%s\" | grep -Fv grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'", ps_options,
    164161            g_sz_call_to_buffer);
    165162    paranoid_free(g_sz_call_to_buffer);
  • trunk/mondo/mondo/common/libmondo-filelist.c

    r783 r794  
    13501350        // 2.6 has /sys as a proc-type thing -- must be excluded
    13511351        asprintf(&tmp,
    1352                 "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o -path /sys -prune -o -path /dev/shm -prune -o -path /media/floppy -prune -o -type d -a -print > %s 2> /dev/null",
     1352                "find %s -maxdepth %d -fstype mvfs -prune -o -fstype afs -prune -o -path /proc -prune -o -path /sys -prune -o -path /dev/shm -prune -o -path /media/floppy -prune -o -type d -a -print > %s 2> /dev/null",
    13531353                 dir, MAX_SKEL_DEPTH, skeleton_filelist);
    13541354#else
    13551355        // On BSD, for example, /sys is the kernel sources -- don't exclude
    13561356        asprintf(&tmp,
    1357                 "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o -type d -a -print > %s 2> /dev/null",
     1357                "find %s -maxdepth %d -fstype mvfs -prune -o -fstype afs -prune -o -path /proc -prune -o -type d -a -print > %s 2> /dev/null",
    13581358                 dir, MAX_SKEL_DEPTH, skeleton_filelist);
    13591359#endif
  • trunk/mondo/mondo/common/newt-specific.c

    r783 r794  
    3232extern char *g_tmpfs_mountpt;
    3333extern char *g_mondo_home;
     34    extern char *ps_options;
    3435
    3536extern void set_signals(int);
     
    232233    }
    233234
     235/**
     236 * Kill any process containing the string @p str surrounded by spaces in its commandline.
     237 */
     238void kill_anything_like_this(char *str) {
     239
     240char *tmp = NULL;
     241
     242asprintf(&tmp,"kill `ps %s | grep \"" %s "\" | awk '{print $1;}' | grep -vx \"\\?\"`", ps_options, str);
     243run_program_and_log_output(tmp, TRUE);
     244paranoid_free(tmp);
     245}
    234246
    235247/**
  • trunk/mondo/mondo/mondoarchive/main.c

    r783 r794  
    3939bool g_skip_floppies;
    4040long diffs;
     41char *ps_options = "auxww";
    4142
    4243extern int g_loglevel;
  • trunk/mondo/mondo/mondorestore/mondo-restore.c

    r783 r794  
    122122 */
    123123char *g_mondo_home = NULL;
     124
     125char *ps_options = "";
    124126
    125127/* @} - end of "Restore-Time Globals" in globalGroup */
  • trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

    r783 r794  
    369369    char *command;
    370370    asprintf(&command,
    371             "kill `ps wax 2> /dev/null | grep petris 2> /dev/null | grep -v grep | cut -d' ' -f2` 2> /dev/null");
     371            "kill `ps 2> /dev/null | grep petris 2> /dev/null | grep -v grep | cut -d' ' -f2` 2> /dev/null");
    372372    paranoid_system(command);
    373373    paranoid_free(command);
     
    19851985         &&
    19861986         run_program_and_log_output
    1987          ("ps wax | grep buffer | grep -v \"grep buffer\"", TRUE) == 0;
     1987         ("ps | grep buffer | grep -v \"grep buffer\"", TRUE) == 0;
    19881988         i++) {
    19891989        sleep(1);
  • trunk/tools/pkg2mdv

    r782 r794  
    6262    s=\`rpm -qlp \$p | egrep '\.spec'\`
    6363    # Use mkrel for mdv
    64     perl -pi -e 's/define mrel[ \t]+([0-9]+)\..*/define mrel    %mkrel \$1/' rpm/SPECS/\$s
    65     perl -pi -e 's/ Bruno Cornec <bruno@mondorescue.org> ([0-9]+.*)/ Bruno Cornec <bcornec@mandriva.org> %{version}-%{release}/' rpm/SPECS/\$s
     64    perl -pi -e "s/define Release:[ \t]+..*/define Release: %mkrel $TAG/" rpm/SPECS/\$s
     65    perl -pi -e 's/ Bruno Cornec <bruno@mondorescue.org>..*/ Bruno Cornec <bcornec@mandriva.org> %{version}-%{release}/' rpm/SPECS/\$s
    6666    rm -rf rpm/BUILD/*
    6767    rpmbuild -ba rpm/SPECS/\$s 2>&1 | tee -a /tmp/mondorescue.log
  • trunk/trac/trac.ini

    r765 r794  
    11[header_logo]
    22src = http://www.mondorescue.org/images/trac-logo.png
     3height = 120
     4width = 350
     5link = http://www.mondorescue.org
    36alt = Mondo Rescue
    4 height = 120
    5 link = http://www.mondorescue.org
    6 width = 350
    77
    88[logging]
     
    1313[trac]
    1414default_charset = iso-8859-15
     15database = sqlite:db/trac.db
    1516templates_dir = /usr/share/trac/templates
     17htdocs_location = /trac/
    1618repository_dir = /mondo/svn/mondorescue
    17 htdocs_location = /trac/
    18 database = sqlite:db/trac.db
    1919
    2020[notification]
     21always_notify_owner = true
    2122smtp_enabled = true
    2223smtp_replyto = trac@svn.mondorescue.org
     
    2526smtp_from = trac@svn.mondorescue.org
    2627always_notify_reporter = true
    27 always_notify_owner = true
    2828
    2929[project]
    30 url = http://www.mondorescue.org
    31 footer = The <a href="http://www.mondorescue.org">Mondo Rescue</a> project is hosted <br>by the <a href="http://www.hpintelco.net">HP Intel Solution Center</a> on a <a href="http://www.mandriva.com">Mandriva</a> system.
    3230name = MondoRescue
    3331descr = GPL disaster recovery solution
     32footer = The <a href="http://www.mondorescue.org">Mondo Rescue</a> project is hosted <br>by the <a href="http://www.hpintelco.net">HP Intel Solution Center</a> on a <a href="http://www.mandriva.com">Mandriva</a> system.
     33url = http://www.mondorescue.org
    3434icon = /mondo/www/html/mondo/favicon.ico
    3535
     
    4141max_size = 262144
    4242
     43[components]
     44webadmin.* = enabled
     45acct_mgr.web_ui.registrationmodule = enabled
     46acct_mgr.web_ui.accountmodule = enabled
     47acct_mgr.htfile.htdigeststore = enabled
     48acct_mgr.api.accountmanager = enabled
     49acct_mgr.web_ui.loginmodule = enabled
     50acct_mgr.htfile.htpasswdstore = enabled
     51acct_mgr.htfile.abstractpasswordfilestore = enabled
     52
    4353[timeline]
    4454changeset_show_files = 0
    4555
     56[account-manager]
     57password_format = htpasswd
     58password_file = /etc/trac.htpasswd
     59
    4660[diff]
    47 tab_width = 8
     61tab_width = 4
    4862
    4963[ticket]
    50 default_version = 2.0.8
     64default_version = 2.0.9
     65default_component = mondo
     66default_milestone = 2.0.9
    5167default_severity = normal
    52 default_component = mondo
    5368default_priority = normal
    54 default_milestone = 2.0.9
    5569
  • trunk/website/downloads.shtml

    r782 r794  
    7373<ul>
    7474    <li>tarballs are available under <a href="ftp://ftp.mondorescue.org/src">ftp://ftp.mondorescue.org/src</a></li>
    75     <li>Subversion browing available at <a href="http://www.mondorescue.org/cgi-bin/trac.cgi/browser/">http://www.mondorescue.org/cgi-bin/trac.cgi/browser/</a></li>
     75    <li>Subversion browing available at <a href="http://trac.mondorescue.org/browser/">http://trac.mondorescue.org/browser/</a></li>
    7676    <li>Anonymous SVN Subversion check out of the project available with the following instruction set: <pre><tt>svn checkout svn://svn.mondorescue.org/mondorescue/branches/stable</tt></pre></li>
    7777</ul>
  • trunk/website/mondorescue.org.conf

    r729 r794  
    1 #
    2 # Apache Virtual Host Configuration File
    3 # Replace * by IP address of the machine
    4 NameVirtualHost *
     1NameVirtualHost 10.3.252.23
    52
    6 <VirtualHost *>
     3<VirtualHost 10.3.252.23>
    74    ServerName www.mondorescue.org
    85    #ServerAlias mondorescue.org
     
    1411    RewriteRule     ^/index\.html$  /index.shtml
    1512    RewriteRule     ^/$  /index.shtml
     13
    1614    <Directory "/mondo/www/html/mondo">
    1715    DirectoryIndex index.shtml
     
    2119        Allow from all
    2220    </Directory>
     21
    2322    <Directory "/mondo/www/cgi-bin">
    2423        AllowOverride All
     
    5655</VirtualHost>
    5756
    58 <VirtualHost *>
     57<VirtualHost 10.3.252.23>
     58    ServerName trac.mondorescue.org
     59    SetEnv TRAC_ENV "/mondo/trac/mondorescue.env"
     60    DocumentRoot /mondo/www/cgi-bin/trac.cgi
     61    ServerAdmin webmaster@mondorescue.org
     62    CustomLog /var/log/httpd/www.mondorescue.org/access_log combined
     63    Errorlog /var/log/httpd/www.mondorescue.org/error_log
     64
     65    # fix mdk bug #16298
     66    PassEnv LC_ALL
     67    PassEnv LANG
     68
     69    <Directory "/mondo/www/cgi-bin">
     70        AllowOverride All
     71        Options ExecCGI FollowSymLinks
     72        Order allow,deny
     73        Allow from all
     74    </Directory>
     75
     76    Alias /trac/ "/usr/share/trac/htdocs/"
     77    ScriptAlias /cgi-bin/ "/mondo/www/cgi-bin/"
     78
     79    # You need something like this to authenticate users
     80    <Location "/login">
     81        AuthType Basic
     82        AuthName "MondoRescue"
     83        AuthUserFile /etc/trac.htpasswd
     84        Require valid-user
     85    </Location>
     86</VirtualHost>
     87
     88<VirtualHost 10.3.252.23>
    5989    ServerName oldwww.mondorescue.org
    6090    ServerAdmin webmaster@mondorescue.org
     
    70100</VirtualHost>
    71101
    72 <VirtualHost *>
     102<VirtualHost 10.3.252.23>
    73103    ServerName www1.mondorescue.org
    74104    ServerAdmin webmaster@mondorescue.org
     
    84114</VirtualHost>
    85115
    86 <VirtualHost *>
     116<VirtualHost 10.3.252.23>
     117    ServerName mondo.hpintelco.org
     118    ServerAdmin webmaster@mondorescue.org
     119    DocumentRoot /var/www/html
     120    CustomLog /var/log/httpd/mondo.hpintelco.org/access_log combined
     121    Errorlog /var/log/httpd/mondo.hpintelco.org/error_log
     122    <Directory "/var/www/html">
     123        Options -Indexes MultiViews FollowSymLinks +Includes
     124        AllowOverride None
     125        Order allow,deny
     126        Allow from all
     127    </Directory>
     128</VirtualHost>
     129
     130<VirtualHost 10.3.252.23>
    87131    ServerName www.mondorescue.com
    88132    ServerAdmin webmaster@mondorescue.com
  • trunk/website/support.shtml

    r764 r794  
    1919    </ul></p>
    2020    <p>Second look at the <a href="/docs.shtml">Mondo Rescue documentation</a> and the extensive FAQ section of the Mondo Rescue HOWTO, as a lot of good tip and tricks are provided there.</p>
    21     <p>Third look at the <a href="http://www.mondorescue.org/cgi-bin/trac.cgi/wiki">Mondo Rescue wiki</a> which may contain additional comments,and feel free to contribute by adding your remarks.</p>
     21    <p>Third look at the <a href="http://trac.mondorescue.org/">Mondo Rescue wiki</a> which may contain additional comments,and feel free to contribute by adding your remarks.</p>
    2222    <p>Fourth look at the <a href="http://sourceforge.net/mailarchive/forum.php?forum_id=5086">Mondo Rescue Mailing List Archives</a> as you're probably not the first with this problem.</p>
    2323    <p>Finally post on the <a href="mailto:mondo-devel_at_lists.sourceforge.net">Mondo Rescue Mailing List</a> if you did not find what you were looking for, as there are more than 400 users there who could help you, including dev team members. <b>But</b>, they can only help you if your provide at least the above mentionned <b>2 first log files</b>.</p>
    24     <p>If your think you found a bug in Mondo Rescue, please <a href="http://www.mondorescue.org/cgi-bin/trac.cgi/newticket">fill a bug report</a> and also include the log files.</p>
    25     <p>Likely, if you wish Mondo Rescue had your dreamed new shiny function, feel free to create an <a href="http://www.mondorescue.org/cgi-bin/trac.cgi/newticket">feature request</a>.</p>
     24    <p>If your think you found a bug in Mondo Rescue, please <a href="http://trac.mondorescue.org/newticket">fill a bug report</a> and also include the log files.</p>
     25    <p>Likely, if you wish Mondo Rescue had your dreamed new shiny function, feel free to create an <a href="http://trac.mondorescue.org/newticket">feature request</a>.</p>
    2626    <div class="h2-3">
    2727            <h2>Mondo Rescue Mailing Lists</h2>
  • trunk/website/top.shtml

    r764 r794  
    3636          <li <!--#if expr="\"$curpage\" = \"support.shtml\"" --> id="current" <!--#endif -->>
    3737          <a href="/support.shtml" title="If you need support (why it's perfect :-)" >Support</a></li>
    38           <li><a href="http://www.mondorescue.org/cgi-bin/trac.cgi/wiki/WikiStart" title="Use the Wiki" target="_blank" >Wiki</a></li>
     38          <li><a href="http://trac.mondorescue.org" title="Use the Wiki" target="_blank" >Wiki</a></li>
    3939          <li <!--#if expr="\"$curpage\" = \"thanks.shtml\"" --> id="current" <!--#endif -->>
    4040          <a href="/thanks.shtml" title="So many helped us. Many thanks" >Thanks</a></li>
Note: See TracChangeset for help on using the changeset viewer.