Changeset 1046


Ignore:
Timestamp:
Jan 9, 2007, 1:29:21 AM (11 years ago)
Author:
bruno
Message:

merge -r1042:1045 $SVN_M/branches/stable

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/rootfs/sbin/init

    r914 r1046  
    175175        LogIt "the CD/hard disk/whatever to physical 1.44MB disks and" 3
    176176        LogIt "insert them, one after the other. Please see the manual." 3
    177         LogIt "The images are in /images on the CD, or /root/images/mindi" 3
     177        LogIt "The images are in /images on the CD, or /var/cache/mindi" 3
    178178        LogIt "on your hard disk. Your archives are probably fine but" 3
    179179        LogIt "your tape streamer and/or CD-ROM drive are eccentric. :-)" 3
  • trunk/mondo-doc/mondorescue-howto.sgml

    r979 r1046  
    488488<row>
    489489<entry>
    490         bash# cd /root/images/mindi
     490        bash# cd /var/cache/mindi
    491491
    492492</entry>
     
    588588<row>
    589589<entry>
    590 bash# cdrecord dev=0,0,0 speed=4 -eject -v /root/images/mindi/mindi.iso
     590        bash# cdrecord dev=0,0,0 speed=4 -eject -v /var/cache/mindi/mindi.iso
    591591
    592592</entry>
     
    11881188Making 2880KB boot disk...........................mkfs.vfat 2.10 (22 Sep 2003)
    11891189... 2880 KB boot disks were created OK                          Done.
    1190 In the directory '/root/images/mindi' you will find the images:-
     1190In the directory '/var/cache/mindi' you will find the images:-
    11911191   mindi-data-1.img    mindi-data-2.img    mindi-data-3.img    mindi-data-4.img    mindi-data-5.img mindi-root.1440.img
    11921192Would you like to create boot+data floppy disks now (y/n) ?n
     
    12161216<entry>
    12171217
    1218         bash# cd /root/images/mindi
     1218        bash# cd /var/cache/mindi
    12191219</entry>
    12201220</row>
     
    27602760</question>
    27612761<answer>
    2762 <para>A: The images are in /root/images/mindi (even if they are
     2762        <para>A: The images are in /var/cache/mindi (even if they are
    27632763created by Mondo) and also in the 'images' directory on the first
    27642764CD of your backup set, if you have backed up to CD. You can copy
     
    27772777<row>
    27782778<entry>
    2779         bash# dd if=/root/images/mindi/mindi-boot.1722.img of=/dev/fd0u1722
     2779        bash# dd if=/var/cache/mindi/mindi-boot.1722.img of=/dev/fd0u1722
    27802780</entry>
    27812781</row>
     
    27922792<row>
    27932793<entry>
    2794         bash# dd if=/root/images/mindi/mindi-data-N.img of=/dev/fd0
     2794        bash# dd if=/var/cache/mindi/mindi-data-N.img of=/dev/fd0
    27952795</entry>
    27962796</row>
  • trunk/mondo/src/common/libmondo-archive.c

    r1043 r1046  
    27522752            if (does_file_exist("/var/cache/mindi/mondorescue.iso")) {
    27532753                popup_and_OK
    2754                     ("Boot+data floppy creation failed.\nHowever, you may burn /var/cache/mindi/mondorescue.iso to a CD\nand boot from that instead if you wish.");
     2754                    ("Boot+data floppy creation failed. However, FYI, you may burn /var/cache/mindi/mondorescue.iso to a CD and boot from that instead if you wish.");
    27552755                res++;
    27562756            }
  • trunk/mondo/src/common/libmondo-filelist.c

    r1043 r1046  
    16031603        tmp2 = call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null");
    16041604        mr_asprintf(&exclude_paths, " %s %s %s %s %s %s . .. \
    1605 " MNT_CDROM " " MNT_FLOPPY " /media/cdrom /media/cdrecorder \
     1605" MNT_CDROM " " MNT_FLOPPY " /media \
    16061606/proc /sys /tmp /var/cache/mondo /var/cache/mindi", excp, tmp, tmp1, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
    16071607        mr_free(tmp);
  • trunk/mondo/src/common/libmondo-tools.c

    r1043 r1046  
    880880#endif
    881881
    882     if ((Lres = free_space_on_given_partition("/var/cache/mondo")) == -1) /* {
    883         Lres = free_space_on_given_partition("/");
    884     }
    885     */
     882    Lres = free_space_on_given_partition("/var/cache");
    886883    log_it("Free space on given partition = %ld MB", Lres);
    887884
    888885    if (Lres < 50) {
    889         fatal_error("Your /var/cache/mondo partition has <50MB free. Please adjust your partition table to something saner.");
     886        fatal_error("Your /var/cache partition has <50MB free. Please adjust your partition table to something saner.");
    890887    }
    891888
  • trunk/tools/qemu-vm.txt

    r1043 r1046  
    8585# for FreeBSD
    8686ln -sf /usr/local/bin/bash /bin/bash
     87
     88# For Slackware
     89take on ftp pkg src + build
     90configure sudo :
     91bruno = NOPASSWD: /sbin/makepkg
  • trunk/trac/trac.ini

    r1043 r1046  
    4444webadmin.* = enabled
    4545acct_mgr.web_ui.registrationmodule = enabled
    46 acct_mgr.web_ui.loginmodule = enabled
    4746acct_mgr.htfile.htdigeststore = enabled
    4847acct_mgr.api.accountmanager = enabled
     
    5049acct_mgr.htfile.htpasswdstore = enabled
    5150acct_mgr.htfile.abstractpasswordfilestore = enabled
     51trac.web.auth.LoginModule = disabled
     52acct_mgr.web_ui.LoginModule = enabled
    5253
    5354[timeline]
     
    6263
    6364[ticket]
    64 default_version = 2.2.0
     65default_version = 2.2.1
    6566default_component = mondo
    66 default_milestone = 2.0.9
     67default_milestone = 2.2.1
    6768default_severity = normal
    6869default_priority = normal
     70
  • trunk/website/mondorescue.org.conf

    r794 r1046  
    33<VirtualHost 10.3.252.23>
    44    ServerName www.mondorescue.org
    5     #ServerAlias mondorescue.org
     5    ServerAlias mondorescue.org
    66    ServerAdmin webmaster@mondorescue.org
    77    DocumentRoot /mondo/www/html/mondo
     
    4747
    4848    # You need something like this to authenticate users
    49     <Location "/cgi-bin/trac.cgi/login">
    50         AuthType Basic
    51         AuthName "MondoRescue"
    52         AuthUserFile /etc/trac.htpasswd
    53         Require valid-user
    54     </Location>
     49    #<Location "/cgi-bin/trac.cgi/login">
     50        #AuthType Basic
     51        #AuthName "MondoRescue"
     52        #AuthUserFile /usr/local/etc/trac.htpasswd
     53        #Require valid-user
     54    #</Location>
    5555</VirtualHost>
    5656
     
    7878
    7979    # 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>
     80    #<Location "/login">
     81        #AuthType Basic
     82        #AuthName "MondoRescue"
     83        #AuthUserFile /usr/local/etc/trac.htpasswd
     84        #Require valid-user
     85    #</Location>
    8686</VirtualHost>
    8787
     
    121121    Errorlog /var/log/httpd/mondo.hpintelco.org/error_log
    122122    <Directory "/var/www/html">
    123         Options -Indexes MultiViews FollowSymLinks +Includes
     123        Options Indexes MultiViews FollowSymLinks +Includes
    124124        AllowOverride None
    125125        Order allow,deny
Note: See TracChangeset for help on using the changeset viewer.