Changeset 1044


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

We now use consistently /var/cache/mindi everywhere

Location:
branches/stable
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/mindi

    r1036 r1044  
    29782978[ "$YOUR_KERNEL_SUCKS" ] && [ ! "$FAILSAFE_KVER" ] && Die "Please install mindi-kernel package. You need it.\nGo to http://www.mondorescue.org and download it, then install it."
    29792979
    2980 rm -f /root/images/mindi/{*img,*gz,*iso}
     2980rm -f /var/cache/mindi/{*img,*gz,*iso}
    29812981
    29822982PrepareDataDiskImages $CACHE_LOC
     
    30283028    LogIt "Finished."
    30293029elif [ "$TAPEDEV" ] ; then
    3030     mkdir -p /root/images/mindi
    3031     rm -f /root/images/mindi/{*img,*gz,*iso}
     3030    mkdir -p /var/cache/mindi
     3031    rm -f /var/cache/mindi/{*img,*gz,*iso}
    30323032    OfferToMakeBootableISO $CACHE_LOC
    30333033    if [ -e "$CACHE_LOC/all.tar.gz" ] ; then
  • branches/stable/mindi/rootfs/sbin/init

    r911 r1044  
    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
  • branches/stable/mondo-doc/mondorescue-howto.sgml

    r978 r1044  
    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>
  • branches/stable/mondo/distributions/conf/mondorescue.conf

    r541 r1044  
    165165# Images creation dir
    166166#
    167 images_dir="/root/images/mindi"
     167images_dir="/var/cache/mindi"
  • branches/stable/mondo/src/common/libmondo-archive.c

    r998 r1044  
    10461046    if (!res) {
    10471047        log_to_screen("Boot+data disks were created OK");
    1048         sprintf(command, "mkdir -p /root/images/mindi/");
     1048        sprintf(command, "mkdir -p /var/cache/mindi/");
    10491049        log_msg(2, command);
    10501050        run_program_and_log_output(command, FALSE);
    10511051        sprintf(command,
    1052                 "cp -f %s/images/mindi.iso /root/images/mindi/mondorescue.iso",
     1052                "cp -f %s/images/mindi.iso /var/cache/mindi/mondorescue.iso",
    10531053                bkpinfo->scratchdir);
    10541054        log_msg(2, command);
     
    27712771 * @c backup_media_type field is used in this function.
    27722772 * @param imagesdir The directory containing the floppy images (usually
    2773  * /root/images/mindi).
     2773 * /var/cache/mindi).
    27742774 *
    27752775 * @return The number of errors encountered (0 for success)
     
    29502950    if (!bkpinfo->nonbootable_backup) {
    29512951#ifdef __FreeBSD__
    2952         if (!does_file_exist("/root/images/mindi/mindi-kern.1722.img"))
     2952        if (!does_file_exist("/var/cache/mindi/mindi-kern.1722.img"))
    29532953#else
    2954         if (!does_file_exist("/root/images/mindi/mindi-bootroot.1722.img")
    2955             && !does_file_exist("/root/images/mindi/mindi-boot.1440.img"))
     2954        if (!does_file_exist("/var/cache/mindi/mindi-bootroot.1722.img")
     2955            && !does_file_exist("/var/cache/mindi/mindi-boot.1440.img"))
    29562956#endif
    29572957        {
    29582958            mvaddstr_and_log_it(g_currentY++, 74, "No Imgs");
    2959             if (does_file_exist("/root/images/mindi/mondorescue.iso")) {
     2959            if (does_file_exist("/var/cache/mindi/mondorescue.iso")) {
    29602960                popup_and_OK
    2961                     ("Boot+data floppy creation failed. However, FYI, you may burn /root/images/mindi/mondorescue.iso to a CD and boot from that instead if you wish.");
     2961                    ("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.");
    29622962                res++;
    29632963            }
    29642964        } else {
    2965             offer_to_write_floppies(bkpinfo, "/root/images/mindi");
     2965            offer_to_write_floppies(bkpinfo, "/var/cache/mindi");
    29662966            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    29672967        }
  • branches/stable/mondo/src/common/libmondo-filelist.c

    r1015 r1044  
    17481748        sprintf(exclude_paths, " %s %s %s %s %s %s . .. \
    17491749" MNT_CDROM " " MNT_FLOPPY " /media/cdrom /media/cdrecorder \
    1750 /proc /sys /root/images/mondo /root/images/mindi ", excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
     1750/proc /sys /tmp /root/images/mondo /var/cache/mindi ", excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
    17511751
    17521752        log_msg(2, "Excluding paths = '%s'", exclude_paths);
  • branches/stable/mondo/src/common/libmondo-tools.c

    r998 r1044  
    10871087#endif
    10881088
    1089     if ((Lres = free_space_on_given_partition("/root")) == -1) {
    1090         Lres = free_space_on_given_partition("/");
    1091     }
     1089    Lres = free_space_on_given_partition("/var/cache");
    10921090    log_it("Free space on given partition = %ld MB", Lres);
    10931091
    10941092    if (Lres < 50) {
    1095         run_program_and_log_output
    1096             ("rm -Rf /root/images/mindi; mkdir -p /home/root/images/mindi; mkdir -p /root/images; ln -sf /home/root/images/mindi /root/images/mindi",
    1097              3);
    1098         //      fatal_error("Your / (or /root) partition has <50MB free. Please adjust your partition table to something saner.");
     1093              fatal_error("Your /var/cache partition has <50MB free. Please adjust your partition table to something saner.");
    10991094    }
    11001095
  • branches/stable/mondo/src/mondoarchive/main.c

    r948 r1044  
    498498    }
    499499
    500     if (does_file_exist("/root/images/mindi/mondorescue.iso")) {
     500    if (does_file_exist("/var/cache/mindi/mondorescue.iso")) {
    501501        log_to_screen
    502             ("/root/images/mindi/mondorescue.iso, a boot/utility CD, is available if you want it.");
     502            ("/var/cache/mindi/mondorescue.iso, a boot/utility CD, is available if you want it.");
    503503    }
    504504
  • branches/stable/tools/qemu-vm.txt

    r1034 r1044  
    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
  • branches/stable/trac/trac.ini

    r1006 r1044  
    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
  • branches/stable/website/mondorescue.org.conf

    r785 r1044  
    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.