Changeset 649 in MondoRescue for trunk/mondo

Timestamp:

Jun 8, 2006, 11:31:13 AM (18 years ago)

Author:

bcornec

Message:

merge -r617:641 $SVN_M/branches/stable

Location:

trunk/mondo

Files:

• ChangeLog (modified) (63 diffs)
• mondo/autorun (modified) (1 prop)
• mondo/common/libmondo-files.c (modified) (1 diff)
• mondo/mondoarchive/mondo-cli.c (modified) (2 diffs)

trunk/mondo/ChangeLog

@@ -3 +3 @@
 MONDO CHANGES
 
-v2.2.0 (2006-06-02) 
+v2.2.0 (2006-06-12) 
 - indent on source files
 - asprintf used instead of malloc_string + sprintf/strcpy/strcat without 
@@ -10 +10 @@
 - Internationalization (A huge thank to rene-marc dolhen
   <rmd_at_mecreant.org> who achieved that big task)
+
+2.0.8-3 (2006-06-07)
+- Fix a bug in -I and -E handling !!
+  (Paolo Bernardoni <bernardoni_at_sysnet.it>/Bruno Cornec)
+- Fix permissions for autorun
+  (Bruno Cornec)
+- Fox delivery problems for tar files with too restrictive umask
+  (Bruno Cornec)
+- Fix parsing of DHCP information in start-nfs script
+  (Andree Leidenfrost)
 
 2.0.8-2 (2006-06-02)
@@ -98 +108 @@
 - now handles cifs correctly (Bruno Cornec)
 
-v2.04_berlios
+v2.04_berlios (2005-10-30)
 - Add -p option to generate ISO images file names with prefix. The new default
   name for ISO images is mondorescue-1.iso, ... For PXE environment, you have
@@ -108 +118 @@
   (this is an unattended mode) (Bruno Cornec)
 
-v2.04
+v2.04 (2005-05-03)
 - made mondo more clever about finding its home. Avoids mondo considering
   directories like '/usr/share/doc/momdo' as its home.
 
-    
-v2.03
+v2.03 (2004-09-29)
 - better SLES8 support
 - test user-specified temp dir's sanity
 
-
-v2.02
+v2.02 (2004-07-21)
 - instead of using 'dd' to erase partition table, delete existing
   partitions w/ the same call to fdisk that is used to create the
@@ -129 +137 @@
 - added ACL, xattr support for afio users
 
-
-v2.01
+v2.01 (2004-06-21)
 - fixed cvs for SuSE systems
 - fixed NTFS backup/restore bug relating to partimagehack
@@ -137 +144 @@
 - better support of ISO dirs at restore-time (Conor Daly)
 
-
-v2.00
+v2.00 (2004-06-18)
 - first 2.0 release
 - updated grub-install.patched to support SuSE and Red Hat
@@ -172 +178 @@
 - added '-R' for star support
 
-
-v1.75
+v1.75 (2004-03-29)
 - fixed chmod/chown bug (Jens Richter)
 - ask user to confirm NFS mountpoint in Interactive Mode
@@ -205 +210 @@
 - replaced mondo-makefilelist with C code - faster, cleaner
 - tweaked GUI - better feedback
-
     
-1.74
+1.74 (2003-09-24)
 - fixed biggiefile atime/ctime restoration bug 73
 - fixed 'default boot loader' detection bug (Joshua Oreman)
@@ -225 +229 @@
 - added partimagehack to the mix
     
-    
-1.73
+1.73 (2003-05-04)
 - mark relevant partitions as bootable _after_ unmounting them
 - resolve boot device (-f) if softlink
@@ -261 +264 @@
 - try to work around eccentricities of multi-CD drive PCs
 - misc clean-ups (Steve Hindle)
-    
-
-v1.72
+
+v1.72 (2003-04-23)
 - LVM/RAID bugs fixed (Brian Borgeson)
 - major clean-up of code (Stan Benoit)
@@ -293 +295 @@
 - fixed fstab-hacking scripts
 
-
-v1.71
+v1.71 (2003-04-04)
 - log newt, slang, ncurses info
 - updated man page
@@ -318 +319 @@
 - added -e support
 
-v1.70
+v1.70 (2003-04-04)
 - new devel branch opened
 
-
-v1.52
+v1.52 (2002-12-08)
 - fixed bug in multithreading
 - use new grub-MR instead of grub-install
@@ -343 +343 @@
 - if user runs as 'su' not 'su -' then work around
 
-
-v1.51
+v1.51 (2002-11-17)
 - pop-up list of changed files, at end of verification phase
 - better handling of changed.files list at restore-time
@@ -381 +380 @@
 - fixed bug in mondo-makefilelist
 
-
-09/08/2002
-""""""""""
-v1.50
+v1.50 (2002-09-08)
 - if restoring, don't try to find SCSI node of CD-ROM drive; find /dev entry
 - during selective restore, skip filesets which don't contain relevant archives
@@ -454 +450 @@
 - fixed bug in --mbr
 
-
-06-04-2002
-""""""""""
-v1.43-7 (STABLE)
+v1.43-7 (2002-06-04)
 - afio uses 16MB buffer when restoring, instead of 8MB buffer
 - mondorestore makes /var/run/console in case user excluded it
@@ -477 +470 @@
 - changed lockfiles from static to random filenames
 
-
-04-12-2002
-""""""""""
-v1.42-3 (STABLE)
+v1.42-3 (2002-04-12)
 - minor cosmetic enhancements
 - improved homedir-locating code
 
-
-04-07-2002
-""""""""""
-v1.42-1 (STABLE)
+v1.42-1 (2002-04-07)
 - mondorestore may now be run on live filesystem, i.e. user does not
   have to reboot in order to restore data; works for CD's and tapes;
@@ -503 +490 @@
 - added '-m' (manual CD tray) flag
     
-
-03-21-2002
-""""""""""
-v1.41-1 (STABLE)
+v1.41-1 (2002-03-21)
 - record hostname (Krzysztof Dubowik)
 
-
-03-10-2002
-""""""""""
-v1.40-7 (STABLE)
+v1.40-7 (2002-03-10)
 - if '-L' then test for lzop; abort if not present
 - if Mondo cannot figure out which boot loader the user is using,
@@ -521 +502 @@
 - mkreiserfs -ff instead of -q (Andy Glass)
 
-
-03-03-2002
-""""""""""
-v1.40-6 (STABLE)
+v1.40-6 (2002-03-03)
 - incorporated new config.guess, config.sub (H�tor Garc� �varez)
 - updated manual to explain tmpfs needs to be in kernel (Mikael Hultgren)
@@ -533 +511 @@
 - modified 'Sliced bigfile #n' log entry to say '..#(n+1)'
 
-
-02-24-2002
-""""""""""
-v1.40-5 (STABLE)
+v1.40-5 (2002-02-24)
 - improved the way Mondo installs itself (Mikael Hultgren)
 - updated manpage
@@ -549 +524 @@
 - put (char*)(&buf) instead of &buf when reading/writing biggiefiles' info
     
-
-02-17-2002
-""""""""""
-v1.40-3 (STABLE)
+v1.40-3 (2002-02-17)
 - let user exclude devices from mountlist with (e.g.) -E /dev/hda1
 - handle one-letter dirs properly (Ian Kent)
@@ -562 +534 @@
 - Italian patch (Michael Baldessari)
 
-
-02-11-2002
-""""""""""
-v1.40-2 (STABLE)
+v1.40-2 (2002-02-11)
 - fixed typo in manpage (Mikael Hultgren)
 - exclude "#"*"#" and *~ from tarball and source RPM
@@ -574 +543 @@
 - cdrecord is only required if burning CD's
 
-
-02-10-2002
-""""""""""
-v1.40-1 (STABLE)
+v1.40-1 (2002-02-10)
 - set partition(s) bootable w/fdisk if appropriate
 - cosmetic bugfixes
@@ -589 +555 @@
 - exclude win386.swp from backup (Cafeole)
 
-    
-02-07-2002
-""""""""""
-v1.38-2 (DEVELOPMENT)
+v1.38-2 (2002-02-07)
 - minor improvements to the NFS-handling code
 - mondo-restore now records Mondo's version# in log
@@ -598 +561 @@
 - fix typo in '10 seconds to abort' line; also, made 20 seconds
 
-
-02-06-2002
-""""""""""
-v1.38-1 (DEVELOPMENT)
+v1.38-1 (2002-02-06)
 - source code has been beautified (Stan Benoit)
 - makefile, Config implemented (Stan Benoit)
@@ -616 +576 @@
 - records+restores biggiefiles' permissions+ownership properly
 
-
-01-25-2002
-""""""""""
-v1.37-1 (DEVELOPMENT)
+v1.37-1 (2002-01-25)
 - proper 'selective restore' interface implemented
 - if the user specifies boot loader or device, record those settings
@@ -636 +593 @@
 - abort if PC has <32MB of RAM at backup-time; warn if <64MB
 
-
-01-20-2002
-""""""""""
-v1.36-1 (DEVELOPMENT)
+v1.36-1 (2002-01-20)
 - fixed v.minor bug in MakeFilelist()
 - in mondo-archive, replaced calls to Die() with calls to FatalError()
@@ -657 +611 @@
 - log versions of afio, bzip2, etc.
 
-
-01-10-2002
-""""""""""
-v1.35-1 (DEVELOPMENT)
+v1.35-1 (2002-01-10)
 - NFS backup+restore support
 - exclude Win2K hiberation file (Paul Rensing)
@@ -684 +635 @@
 - tab-align /etc/fstab after hacking it
 
-
-12-25-2001
-""""""""""
-v1.34-1 (DEVELOPMENT)
+v1.34-1 (2001-12-25)
 - if /sbin or /usr/sbin are not in PATH then add them temporarily
 - if --broken-bios then force LILO to run in backward-compatible mode
@@ -697 +645 @@
   as it can upset the restoration of biggiefiles which are spread across CD's
 
-
-12-19-2001
-""""""""""
-v1.33-8 (DEVELOPMENT)
+v1.33-8 (2001-12-19)
 - implemented --image-devs <dev> (<...>) switch
 - improved --verify switch's code
@@ -715 +660 @@
 - abort if user tries to backup a mounted partition as an _image_
 
-
-12-15-2001
-""""""""""
-v1.33-6 (DEVELOPMENT)
+v1.33-6 (2001-12-15)
 - misc bugfixes
 
-
-12-14-2001
-""""""""""
-v1.33-5 (DEVELOPMENT)
+v1.33-5 (2001-12-14)
 - improved error-reporting in the event of boot loader detection failure
 - improved tape verification code
 - experimental support for backing up and restoring devices as images
 
-
-12-13-2001
-""""""""""
-v1.33-4 (DEVELOPMENT)
+v1.33-4 (2001-12-13)
 - updated FAQ
 - experimental GRUB support
@@ -740 +676 @@
 - when writing floppies, ask specifically for floppy #x (Randy Delfs)
 
-
-12-12-2001
-""""""""""
-v1.33-3 (DEVELOPMENT)
+v1.33-3 (2001-12-12)
 - supports --boot-loader and --boot-device to let user specify them
 - fixed CDRW node autodetection bug
 - MONDO_PATH was misconfigured; is now "/usr/share/mondo"
 
-12-12-2001
-""""""""""
-v1.33-1 (DEVELOPMENT)
+v1.33-1 (2001-12-12)
 - if user changes a partition's device, change it in raidtab too
 - don't extrapolate from /etc/raidtab to /tmp/mountlist; editor does it already
@@ -765 +696 @@
   or added since the last complete backup
 
-
-12-09-2001
-""""""""""
-v1.32-2 (DEVELOPMENT)
+v1.32-2 (2001-12-09)
 - if no RAID devices after editing mountlist then delete raidtab
 - don't try to mount RAID partitions (components of RAID dev)
@@ -776 +704 @@
 - when user selects RAID level, establish whether said level is available
 
-
-12-09-2001
-""""""""""
-v1.32 (DEVELOPMENT)
+v1.32 (2001-12-09)
 - if user creates ISO images, the default dest dir is /root/images/mondo now
 - log_it() makes sure it only writes one \n on the end of each logged line
@@ -797 +722 @@
 - scratchdir is now [path]/mondo.scratch.$$; was just [path]/mondo.scratch
 
-
-12-04-2001
-""""""""""
-v1.31 (DEVELOPMENT)
+v1.31 (2001-12-04)
 - turned on '-Wall' to find cruft; found lots of it; cleaned it up
 - exclude each device's lost+found directory
@@ -831 +753 @@
   just end up looking very silly :)
 
-
-11-28-2001
-""""""""""
-v1.30 (DEVELOPMENT)
+v1.30 (2001-11-28)
 - I have reorganized the C code, sorted the subroutines alphabetically, and
   re-jigged Mondo's installation routines (inc. the RPM spec file) to reflect
@@ -854 +773 @@
   executable is sane & will run OK at restore-time
 
-
-11-14-2001
-""""""""""
-v1.19
+v1.19 (2001-11-14)
 - tested on Linux-Mandrake 8.0 and Red Hat 7.2; backup,wipe,restore went OK
 - fixed a bug in is_this_device_mounted()
@@ -880 +796 @@
 - each CD's slices were being listed to screen; now, piped to /dev/null
 
-
-10-28-2001
-""""""""""
-v1.18
+v1.18 (2001-10-28)
 - changed minor error in documentation (mondo-archive's --help output)
 - improved Mondo's compare phase for tape users
 
-
-10-20-2001
-""""""""""
-v1.17
+v1.17 (2001-10-20)
 - the deprecated scripts now work with LZO
 - if mondo-restore cannot mount all devices, it will _unmount_ whatever it did
@@ -909 +819 @@
   Mindi's deplist.txt; add them if you want to use the scripts
 
-
-10-10-2001
-""""""""""
-v1.16
+v1.16 (2001-10-10)
 - default scratchdir is `pwd`/mondo.scratch.$$ (was mondo.scratch)
 - when asking user to send me a log file, warn them that the log file may
@@ -940 +847 @@
   politely direct them to Mindi :-)
 
-
-09-28-2001
-""""""""""
-v1.15
+v1.15 (2001-09-28)
 - serialized the call to mondo-filelistchop.c; helps to improve visual feedback
   (yeah, sounds weird but it's true)
@@ -961 +865 @@
   a lot of testing to make sure Mondo would play nicely with the new Mindi
 
-
-09-18-2001
-""""""""""
-v1.14
+v1.14 (2001-09-18)
 - if verify is enabled then verify each CD/ISO after writing it
 - fixed a quasi-bug in mondo/mount-me; this script used 'sort +1' which is
@@ -1000 +901 @@
 - modularized the install.sh and mondo-1.14-x.i386.rpm compilation sections
 
-
-09-01-2001
-""""""""""
-v1.13
+v1.13 (2001-09-01)
 - fixed some compiler warnings in mondo-newt.c; rearranged some code
 - mondo-tarme now uses -M 16m -t 4k in its call to afio, to improve performance
@@ -1042 +940 @@
 - added lots of sanity-checking to mountlist editor
 
-
-08-18-2001
-""""""""""
-v1.12
+v1.12 (2001-08-18)
 - changed cdrecord's FIFO size to 8MB
 - removed -pad and -sort from the call to mkisofs
@@ -1069 +964 @@
 - updated the FAQ
 
-
-08-12-2001
-""""""""""
-v1.10
+v1.10 (2001-08-12)
 - changed cdrecord's FIFO size back to 4MB
 - added -pad -sort to the call to mkisofs
@@ -1092 +984 @@
 - working on Cuckoo Mode...
 
-
-08-02-2001
-""""""""""
-v1.09
+v1.09 (2001-08-02)
 - default compression level is now 3 (was 2)
 - retry/fail/abort loop bug fixed
@@ -1101 +990 @@
   my temp dir and to put the images in my 'images' folder
 
-
-07-28-2001
-""""""""""
-v1.08
+v1.08 (2001-07-28)
 - offer to Retry/Fail/Abort if an error occurs when Mondo tries to burn a CD-R
 - warn if kernel is 2.4.[0-5] (could have buggy loopfs code)
 - tested with RAID-5 --- works fine :-)
 
-
-07-22-2001
-""""""""""
-v1.07
+v1.07 (2001-07-22)
 - fixed cosmetic mistake in an error msg in mondo-tarme ('continue'-related)
 - hack-fstab now uses "defaults 0 0" instead of "default 1 3" when making
@@ -1131 +1014 @@
 - mondo-restore.c is now compiled statically
 
-
-07-19-2001
-""""""""""
-v1.06
+v1.06 (2001-07-19)
 - now software-RAID compatible
 - install.sh only compiles mondo-restore.c once now
@@ -1143 +1023 @@
 - for each /dev/md* device in the mountlist, run raidstop before mkraid
 
-
-07-16-2001
-""""""""""
-v1.05
+v1.05 (2001-07-16)
 - patch from DoJ to make install.sh compile with -O2, not -O
 - cosmetic changes to the biggiefile-slicing code
 - fixed install.sh
 
-
-07-15-2001
-""""""""""
-v1.04
+v1.04 (2001-07-15)
 - make-me-bootable only "boot-makes" each partition ONCE now
 - cosmetic changes to mondo-restore's logfile output
@@ -1160 +1034 @@
 - should be able to cope with Red Hat's "LABEL=" messages in /etc/fstab
 
-
-07-14-2001
-""""""""""
-v1.03
+v1.03 (2001-07-14)
 - looks for /etc/lilo.conf; aborts if it cannot locate it
 - abort if burning CD's & verify level>=2 (must be 1 or 0 if burning CD's)
@@ -1180 +1051 @@
   last N days (N specified by user)
 
-
-07-07-2001
-""""""""""
-v1.02
+v1.02 (2001-07-07)
 - retract the CD tray after asking user to enter 'continue' (PauseAndAskForCDR)
 - uses C program instead of bash loop for PauseAndAskForCDR; some bash versions
@@ -1198 +1066 @@
 - can accept multiple parameters in the '--bkpath' switch
 
-07-04-2001
-""""""""""
-v1.00
+v1.00 (2001-07-04)
 - thanks to recent changes to Mindi, Mondo is now compatible with the 
   filesystem formats JFS, ext3, ReiserFS, XFS and ext2 (if your own kernel is)
@@ -1222 +1088 @@
   8MB less than its max size, which wasted 8-10MB of storage space per disk
 
-
-03-15-2001
-""""""""""
-v0.99
+v0.99 (2001-03-15)
 - /proc and /tmp removed --- i.e. added to exclude list :)
 - Mondo now uses 2.4-series kernel and modules (Bruno Cornec)
@@ -1233 +1096 @@
 - incorporated Mondo v0.977's restore scripts' bugfixes (Maciej Kulasa)
 
-
-03-06-2001
-""""""""""
-v0.981
+v0.981 (2001-03-06)
 - put 'dd' in coolstuff.tgz (Art Wells)
 
-
-02-26-2001
-""""""""""
-v0.98
+v0.98 (2001-02-28)
 - INSTALL script renamed to install.sh
 - tarball cleaned up and re-tarred (Art Wells)
@@ -1248 +1105 @@
 - work is underway to make Mondo compatible with the Linux kernel's 2.4 series
 
-02-28-2001
-""""""""""
-v0.977
+v0.977 (2001-02-26)
 - based on v0.976
 - missing subs and silly typos fixed in restore scripts (Maciej Kulasa)
@@ -1256 +1111 @@
 - Mondo is being actively developed again (yippee!)
 
-09-01-2000
-""""""""""
-v0.976
+v0.976 (2000-09-01)
 - technical changes
   - 12MB ramdisk
@@ -1281 +1134 @@
   - changed lots of 'grep " $string "' to 'grep -w "$string"' (thanks, Matija)
 
-07-03-2000
-""""""""""
-v0.975 published
+v0.975 (2000-07-03)
 - made mondo-tarme use 'ask-me-a-question' to pause for new, blank CD-Rs
 - don't deeply search isodir for ISO files to wipe: maxdepth should be 1
@@ -1296 +1147 @@
 - ramdisk is now 14MB
 
-06-16-2000
-""""""""""
-v0.972 published
+v0.972 (2000-06-16)
 - auto-archive, mondo-archive and mondo-tarme updated to make them more
   friendly towards mult-disk sets
 - if multiple CDRW drives, user is asked which mondo-archive should use
 
-06-14-2000
-""""""""""
-v0.971 published
+v0.971 (2000-06-14)
 - auto-archive now passes CD size to mondo-archive
 - mondo-tarme, in conjunction with auto-archive, now handles CDRW boot/burn
   sharing much better than before
 
-06-10-2000
-""""""""""
-v0.970 published
+v0.970 (2000-06-10)
 - kernel now creates 12MB ramdrive (was 16MB)
 - lots of silly bugs & overhead problems fixed; 2nd floppy closer to working
@@ -1329 +1174 @@
 - nicer help screens on boot floppy
 
-06-03-2000
-""""""""""
-v0.965 released
+v0.965 (2000-06-03)
 - 2MB of space left empty at end of every CD (e.g. 650MB is only 648MB full)
 - Suzhe & Lonius's SmartBootManager (sbminst) is used instead of Win98's MBR
@@ -1337 +1180 @@
 - silly bugs in prep-me... fixed
 
-06-02-2000
-""""""""""
-v0.964 released
+v0.964 (2000-06-02)
 - VFAT partitions >8GB handled OK now
 - 2nd floppy (optionally) created for SCSI users <--- not working yet
@@ -1347 +1188 @@
 - 'resize hack' retitled as 'vacuum-pack'
 
-05-31-2000
-""""""""""
-v0.963 released
+v0.963 (2000-05-31)
 - ISO images are no longer padded
 - all currently-loaded modules are backed up to custom hboot.img & installed
@@ -1367 +1206 @@
   Lin/Win and Linux-only PCs)
 
-05-25-2000
-""""""""""
-v0.962 released
+v0.962 (2000-05-25)
 - silly bug in mondo-checksum fixed
 - stale tmp dirs are now definitely deleted (bug fixed)
@@ -1383 +1220 @@
 - Mondo will now archive and restore Linux AND LinWin systems ok. W00H00! :-)
 
-05-23-2000
-""""""""""
-v0.961 released
+v0.961 (2000-05-23)
 - mondo-checksum ignores files <2k in length
 - default compression level is 4
@@ -1394 +1229 @@
 - fixed bug in 'hack-fstab' which stopped processing fstab if blank line found
 
-05-22-2000
-""""""""""
-v0.960 released
+v0.960 (2000-05-22)
 - mondo-vfat-1.0 package released, to provide kludging for VFAT bootables
 - logfile now saved at /var/log/mondo-archive.log (not `pwd`/mondo-archive.log)
@@ -1408 +1241 @@
 - really ugly boot kludge has been implemented, using embleer files
   to make newly-formatted VFAT partitions bootable
-
-[snip]
-...see CHANGES.pre-v0.96 for the rest (if you can find it)
-
-
-
-
-
-
-
-

trunk/mondo/mondo/common/libmondo-files.c

@@ -1158 +1158 @@
     fprintf(fout, "    echo $i | grep -qi ipconf= && ipconf=`echo $i | cut -d= -f2`\n");
     fprintf(fout, "done\n");
-    fprintf(fout, "grep -q \"dhcp\" \"$ipconf\"\n");
+    fprintf(fout, "echo \"$ipconf\" | grep -q \"dhcp\"\n");
     fprintf(fout, "if [ $? = 0 ]; then\n");
     fprintf(fout, "    ipdev=`echo $ipconf | cut -d: -f1`\n");
-    fprintf(fout, "    udhcpc -i $ipdev\n", );
+    fprintf(fout, "    udhcpc -i $ipdev\n");
     fprintf(fout, "else\n");
     fprintf(fout, "    if [ \"$ipconf\" != \"\" ]; then\n");

trunk/mondo/mondo/mondoarchive/mondo-cli.c

@@ -312 +312 @@
             if (q != NULL) {
                 *q = '\0';
-                p = q+1 ;
                 if (stat(p, &buf) != 0) {
                     log_msg(1, "ERROR ! %s doesn't exist", p);
                     fatal_error("ERROR ! You specified a directory to include which doesn't exist");
                 }
+                p = q+1 ;
             } else {
                 if (stat(p, &buf) != 0) {
@@ -548 +548 @@
             if (q != NULL) {
                 *q = '\0';
-                p = q+1 ;
                 if (stat(p, &buf) != 0) {
                     log_msg(1, "WARNING ! %s doesn't exist", p);
                 }
+                p = q+1 ;
             } else {
                 if (stat(p, &buf) != 0) {