Changeset 1046 in MondoRescue for trunk

Timestamp:

Jan 9, 2007, 1:29:21 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r1042:1045 $SVN_M/branches/stable

Location:

trunk

Files:

• mindi/rootfs/sbin/init (modified) (1 diff)
• mondo-doc/mondorescue-howto.sgml (modified) (7 diffs)
• mondo/src/common/libmondo-archive.c (modified) (1 diff)
• mondo/src/common/libmondo-filelist.c (modified) (1 diff)
• mondo/src/common/libmondo-tools.c (modified) (1 diff)
• tools/qemu-vm.txt (modified) (1 diff)
• trac/trac.ini (modified) (3 diffs)
• website/mondorescue.org.conf (modified) (4 diffs)

trunk/mindi/rootfs/sbin/init

@@ -175 +175 @@
         LogIt "the CD/hard disk/whatever to physical 1.44MB disks and" 3
         LogIt "insert them, one after the other. Please see the manual." 3
-        LogIt "The images are in /images on the CD, or /root/images/mindi" 3
+        LogIt "The images are in /images on the CD, or /var/cache/mindi" 3
         LogIt "on your hard disk. Your archives are probably fine but" 3
         LogIt "your tape streamer and/or CD-ROM drive are eccentric. :-)" 3

trunk/mondo-doc/mondorescue-howto.sgml

@@ -488 +488 @@
 <row>
 <entry>
-        bash# cd /root/images/mindi
+        bash# cd /var/cache/mindi
 
 </entry>
@@ -588 +588 @@
 <row>
 <entry>
-bash# cdrecord dev=0,0,0 speed=4 -eject -v /root/images/mindi/mindi.iso
+        bash# cdrecord dev=0,0,0 speed=4 -eject -v /var/cache/mindi/mindi.iso
 
 </entry>
@@ -1188 +1188 @@
 Making 2880KB boot disk...........................mkfs.vfat 2.10 (22 Sep 2003)
 ... 2880 KB boot disks were created OK                          Done.
-In the directory '/root/images/mindi' you will find the images:-
+In the directory '/var/cache/mindi' you will find the images:-
    mindi-data-1.img    mindi-data-2.img    mindi-data-3.img    mindi-data-4.img    mindi-data-5.img mindi-root.1440.img
 Would you like to create boot+data floppy disks now (y/n) ?n
@@ -1216 +1216 @@
 <entry>
 
-        bash# cd /root/images/mindi
+        bash# cd /var/cache/mindi
 </entry>
 </row>
@@ -2760 +2760 @@
 </question>
 <answer>
-<para>A: The images are in /root/images/mindi (even if they are
+        <para>A: The images are in /var/cache/mindi (even if they are
 created by Mondo) and also in the 'images' directory on the first
 CD of your backup set, if you have backed up to CD. You can copy
@@ -2777 +2777 @@
 <row>
 <entry>
-        bash# dd if=/root/images/mindi/mindi-boot.1722.img of=/dev/fd0u1722
+        bash# dd if=/var/cache/mindi/mindi-boot.1722.img of=/dev/fd0u1722
 </entry>
 </row>
@@ -2792 +2792 @@
 <row>
 <entry>
-        bash# dd if=/root/images/mindi/mindi-data-N.img of=/dev/fd0
+        bash# dd if=/var/cache/mindi/mindi-data-N.img of=/dev/fd0
 </entry>
 </row>

trunk/mondo/src/common/libmondo-archive.c

@@ -2752 +2752 @@
             if (does_file_exist("/var/cache/mindi/mondorescue.iso")) {
                 popup_and_OK
-                    ("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.");
+                    ("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.");
                 res++;
             }

trunk/mondo/src/common/libmondo-filelist.c

@@ -1603 +1603 @@
         tmp2 = call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null");
         mr_asprintf(&exclude_paths, " %s %s %s %s %s %s . .. \
-" MNT_CDROM " " MNT_FLOPPY " /media/cdrom /media/cdrecorder \
+" MNT_CDROM " " MNT_FLOPPY " /media \
 /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);
         mr_free(tmp);

trunk/mondo/src/common/libmondo-tools.c

@@ -880 +880 @@
 #endif
 
-    if ((Lres = free_space_on_given_partition("/var/cache/mondo")) == -1) /* {
-        Lres = free_space_on_given_partition("/");
-    }
-    */
+    Lres = free_space_on_given_partition("/var/cache");
     log_it("Free space on given partition = %ld MB", Lres);
 
     if (Lres < 50) {
-        fatal_error("Your /var/cache/mondo partition has <50MB free. Please adjust your partition table to something saner."); 
+        fatal_error("Your /var/cache partition has <50MB free. Please adjust your partition table to something saner."); 
     }
 

trunk/tools/qemu-vm.txt

@@ -85 +85 @@
 # for FreeBSD
 ln -sf /usr/local/bin/bash /bin/bash
+
+# For Slackware
+take on ftp pkg src + build
+configure sudo :
+bruno = NOPASSWD: /sbin/makepkg

trunk/trac/trac.ini

@@ -44 +44 @@
 webadmin.* = enabled
 acct_mgr.web_ui.registrationmodule = enabled
-acct_mgr.web_ui.loginmodule = enabled
 acct_mgr.htfile.htdigeststore = enabled
 acct_mgr.api.accountmanager = enabled
@@ -50 +49 @@
 acct_mgr.htfile.htpasswdstore = enabled
 acct_mgr.htfile.abstractpasswordfilestore = enabled
+trac.web.auth.LoginModule = disabled
+acct_mgr.web_ui.LoginModule = enabled
 
 [timeline]
@@ -62 +63 @@
 
 [ticket]
-default_version = 2.2.0
+default_version = 2.2.1
 default_component = mondo
-default_milestone = 2.0.9
+default_milestone = 2.2.1
 default_severity = normal
 default_priority = normal
+

trunk/website/mondorescue.org.conf

@@ -3 +3 @@
 <VirtualHost 10.3.252.23>
     ServerName www.mondorescue.org
-    #ServerAlias mondorescue.org
+    ServerAlias mondorescue.org
     ServerAdmin webmaster@mondorescue.org
     DocumentRoot /mondo/www/html/mondo
@@ -47 +47 @@
 
     # You need something like this to authenticate users
-    <Location "/cgi-bin/trac.cgi/login">
-        AuthType Basic
-        AuthName "MondoRescue"
-        AuthUserFile /etc/trac.htpasswd
-        Require valid-user
-    </Location>
+    #<Location "/cgi-bin/trac.cgi/login">
+        #AuthType Basic
+        #AuthName "MondoRescue"
+        #AuthUserFile /usr/local/etc/trac.htpasswd
+        #Require valid-user
+    #</Location>
 </VirtualHost>
 
@@ -78 +78 @@
 
     # You need something like this to authenticate users
-    <Location "/login">
-        AuthType Basic
-        AuthName "MondoRescue"
-        AuthUserFile /etc/trac.htpasswd
-        Require valid-user
-    </Location>
+    #<Location "/login">
+        #AuthType Basic
+        #AuthName "MondoRescue"
+        #AuthUserFile /usr/local/etc/trac.htpasswd
+        #Require valid-user
+    #</Location>
 </VirtualHost>
 
@@ -121 +121 @@
     Errorlog /var/log/httpd/mondo.hpintelco.org/error_log
     <Directory "/var/www/html">
-        Options -Indexes MultiViews FollowSymLinks +Includes
+        Options Indexes MultiViews FollowSymLinks +Includes
         AllowOverride None
         Order allow,deny