Changeset 729 in MondoRescue for trunk/mondo
- Timestamp:
- Jul 30, 2006, 4:06:39 PM (18 years ago)
- Location:
- trunk/mondo
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/ChangeLog
r687 r729 3 3 MONDO CHANGES 4 4 5 2. 2.0-1 (2006-06-12)5 2.3.0 (2006-07-30) 6 6 - indent on source files 7 7 - asprintf used instead of malloc_string + sprintf/strcpy/strcat without verifications. Optimisations on memory consumption (allocate only size needed + remove memory leaks) (Bruno Cornec) 8 8 - Internationalization (A huge thank to rene-marc dolhen <rmd_at_mecreant.org> who achieved that big task) 9 9 10 2.0.9 (2006-06-26) 10 2.0.9 (2006-07-30) 11 - Fix various screen corruption for 'Configure LVM'/RAID sync (Andree Leidenfrost) 12 - SuSE RPMS now use bzip2 (Lars Rupp/Bruno Cornec) 13 - Exclude mvfs type of filesystem (ClearCase) from mondo backup (Bruno Cornec) 14 - Improved .spec Requires (Fedora/SuSE feedbacks) (Bruno Cornec) 11 15 - nfsmount option added to allow redeployment from another NFS server (Bruno Cornec) 12 16 - Replaced all occurrences of egrep with 'grep -E' and of fgrep with 'grep -F' (Andree Leidenfrost) -
trunk/mondo/distributions/mandriva/spec.m4
r561 r729 2 2 dnl 3 3 dnl SSS is replaced by the source package format 4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}- %{tag}.tar.bz2')dnl4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl 5 5 dnl DDD is replaced by the list of dependencies specific to that distro 6 6 define(`DDD', )dnl … … 8 8 define(`GRP', `Archiving/Backup')dnl 9 9 dnl OBS is replaced with what is being obsoleted 10 define(`OBS', `Obsoletes: libmondo <= 2.0410 define(`OBS', `Obsoletes: libmondo 11 11 Provides: libmondo')dnl -
trunk/mondo/distributions/redhat/spec.m4
r561 r729 2 2 dnl 3 3 dnl SSS is replaced by the source package format 4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}- %{tag}.tar.gz')dnl4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.gz')dnl 5 5 dnl DDD is replaced by the list of dependencies specific to that distro 6 6 define(`DDD', )dnl -
trunk/mondo/distributions/rpm/mondo.spec
r588 r729 3 3 # 4 4 5 %define mrel RRR 6 %define tag TTT 7 # if mandriva official build (rpm --with is_official) 8 %{?is_official:%define rel %{mkrel} %{mrel}}%{!?is_official:%define rel %{mrel}} 9 %define addreq mindi >= 1.0.7, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1 DDD 5 %define addreq mindi >= 1.0.7, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, DDD 10 6 11 7 Summary: A program which a Linux user can utilize to create a rescue/restore CD/tape … … 16 12 Name: mondo 17 13 Version: VVV 18 Release: %{mrel}14 Release: RRR 19 15 License: GPL 20 16 Group: GRP … … 22 18 Source: SSS 23 19 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) 24 BuildRequires: newt-devel >= 0.50, slang-devel >= 1.4.1,gcc20 BuildRequires: newt-devel >= 0.50, gcc 25 21 OBS 26 22 %ifarch ia64 … … 59 55 60 56 %prep 61 %setup -q -n %name-%{version} -%{tag}57 %setup -q -n %name-%{version} 62 58 63 59 %build … … 76 72 77 73 %files 74 %defattr(-,root,root) 78 75 %doc ChangeLog svn.log 79 76 %doc INSTALL COPYING README TODO AUTHORS NEWS -
trunk/mondo/distributions/suse/spec.m4
r561 r729 2 2 dnl 3 3 dnl SSS is replaced by the source package format 4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}- %{tag}.tar.gz')dnl4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl 5 5 dnl DDD is replaced by the list of dependencies specific to that distro 6 6 define(`DDD', `, buffer, cdrecord')dnl … … 8 8 define(`GRP', `Productivity/Archiving/Backup')dnl 9 9 dnl OBS is replaced vy what is being obsoleted 10 define(`OBS', )dnl10 define(`OBS', `Obsoletes: mondo <= 2.06')dnl -
trunk/mondo/mondo/Makefile.am
r426 r729 2 2 DIST_SUBDIRS = ${SUBDIRS} 3 3 4 pkgdata_DATA = do-not-compress-these autorun 4 pkgdata_DATA = do-not-compress-these 5 scriptdir = $(pkgdatadir) 6 script_DATA = autorun 7 8 install-data-hook: 9 @for prog in $(script_DATA); do \ 10 chmod +x $(scriptdir)/$$prog; \ 11 done -
trunk/mondo/mondo/common/libmondo-archive.c
r689 r729 3076 3076 } else { 3077 3077 file_to_openin = biggie_filename; 3078 asprintf(&command, "md5sum '%s'", biggie_filename); 3078 if (strchr(biggie_filename,'\'') != NULL) { 3079 asprintf(&command, "md5sum \"%s\"", biggie_filename); 3080 } else { 3081 asprintf(&command, "md5sum '%s'", biggie_filename); 3082 } 3079 3083 if (!(fin = popen(command, "r"))) { 3080 3084 log_OS_error("Unable to popen-in command"); -
trunk/mondo/mondo/common/libmondo-devices.c
r689 r729 1575 1575 if (bkpinfo->media_device != NULL) { 1576 1576 asprintf(&tmp, 1577 _("I think I've found your %s burner at SCSI node %s; am I right on the money? "),1577 _("I think I've found your %s burner at SCSI node %s; am I right on the money? Say no if you have an IDE burner and you are running a 2.6 kernel. Instead, specify the IDE burner's /dev address at the next screen."), 1578 1578 media_descriptor_string(bkpinfo-> 1579 1579 backup_media_type), … … 2021 2021 { 2022 2022 return(call_program_and_get_last_line_of_output 2023 ("mount -t coda,ncpfs,nfs,smbfs,cifs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));2023 ("mount -t coda,ncpfs,nfs,smbfs,cifs,mvfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'")); 2024 2024 /* BERLIOS : Useless 2025 2025 asprintf(&exclude_these_devices, 2026 2026 call_program_and_get_last_line_of_output 2027 ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs ) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));2027 ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|mvfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'")); 2028 2028 */ 2029 2029 } … … 2072 2072 #ifdef __FreeBSD__ 2073 2073 tmp = call_program_and_get_last_line_of_output 2074 ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'");2074 ("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;}'"); 2075 2075 #else 2076 2076 tmp = call_program_and_get_last_line_of_output 2077 ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs | 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;}'");2077 ("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;}'"); 2078 2078 #endif 2079 2079 -
trunk/mondo/mondo/common/libmondo-filelist.c
r689 r729 1355 1355 // 2.6 has /sys as a proc-type thing -- must be excluded 1356 1356 asprintf(&tmp, 1357 "find %s -maxdepth %d-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",1358 dir, MAX_SKEL_DEPTH, skeleton_filelist);1357 "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", 1358 dir, MAX_SKEL_DEPTH, g_skeleton_filelist); 1359 1359 #else 1360 1360 // On BSD, for example, /sys is the kernel sources -- don't exclude 1361 1361 asprintf(&tmp, 1362 "find %s -maxdepth %d-path /proc -prune -o -type d -a -print > %s 2> /dev/null",1363 dir, MAX_SKEL_DEPTH, skeleton_filelist);1362 "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o -type d -a -print > %s 2> /dev/null", 1363 dir, MAX_SKEL_DEPTH, g_skeleton_filelist); 1364 1364 #endif 1365 1365 system(tmp); -
trunk/mondo/mondo/mondorestore/mondo-prep.c
r689 r729 234 234 asprintf(&command, 235 235 "for i in `%s | grep -i lvm | cut -d'\"' -f2` ; do %s -a n $i ; %s $i; echo \"Shutting down vg $i\" >> " 236 MONDO_LOGFILE "; done ; %s -a n", vgscan_sz, vgchange_sz, vgremove_sz, vgremove_sz);236 MONDO_LOGFILE "; done", vgscan_sz, vgchange_sz, vgremove_sz); 237 237 paranoid_free(vgchange_sz); 238 238 paranoid_free(vgremove_sz); -
trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c
r688 r729 1352 1352 paranoid_free(format_str); 1353 1353 1354 if (str str(mountlist->el[currline].device, RAID_DEVICE_STUB)1355 || !strcmp(mountlist->el[currline].mountpoint, "image")) {1356 mountlist->el[currline].size =1357 calculate_raid_device_size(mountlist, raidlist,1354 if (strcmp(mountlist->el[currline].mountpoint, "image")) { 1355 if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)) { 1356 mountlist->el[currline].size = 1357 calculate_raid_device_size(mountlist, raidlist, 1358 1358 mountlist->el[currline].device); 1359 } else { 1360 mountlist->el[currline].size = atol(size_str) * 1024; 1359 } else { 1360 mountlist->el[currline].size = atol(size_str) * 1024; 1361 } 1361 1362 } 1362 1363 paranoid_free(size_str); -
trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c
r689 r729 320 320 asprintf(&mount_isodir_command, "mount %s -o ro %s", g_isodir_device, bkpinfo->isodir); 321 321 } 322 run_program_and_log_output("df - P -m", FALSE);322 run_program_and_log_output("df -m", FALSE); 323 323 asprintf(&tmp, 324 324 "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?", … … 445 445 } 446 446 close_progress_form(); 447 run_program_and_log_output("df - P -m", TRUE);447 run_program_and_log_output("df -m", TRUE); 448 448 if (retval) { 449 449 if (g_partition_table_locked_up > 0) { … … 476 476 mvaddstr_and_log_it(g_currentY++, 74, _("Done.")); 477 477 } 478 run_program_and_log_output("df - P -m", 3);478 run_program_and_log_output("df -m", 3); 479 479 paranoid_free(mountlist); 480 480 return (retval); … … 766 766 FALSE); 767 767 run_program_and_log_output("cd " MNT_RESTORING 768 "; for i in `ls home/`; do echo \"Moving $i's spurious files to $i/.disabled\"; mkdir $i/.disabled ; mv -f $i/.DCOP* $i/.MCOP* $i/.*authority $i/.kde/tmp* $i/.kde/socket* $i/.disabled/ ; done",768 "; for i in `ls home/`; do echo \"Moving $i's spurious files to $i/.disabled\"; mkdir \"$i\"/.disabled ; mv -f \"$i\"/.DCOP* \"$i\"/.MCOP* \"$i\"/.*authority \"$i\"/.kde/tmp* \"$i\"/.kde/socket* \"$i\"/.disabled/ ; done", 769 769 TRUE); 770 770 run_program_and_log_output("rm -f " MNT_RESTORING "/var/run/*.pid", … … 1971 1971 sort_mountlist_by_mountpoint(mountlist, 0); 1972 1972 1973 run_program_and_log_output("df - P -m", 3);1973 run_program_and_log_output("df -m", 3); 1974 1974 mvaddstr_and_log_it(g_currentY, 0, _("Unmounting devices ")); 1975 1975 open_progress_form(_("Unmounting devices"), … … 2400 2400 paranoid_free(screen_message); 2401 2401 2402 if (raidlist->el[i].progress == -1) // delayed while another partition inits 2403 { 2402 if (raidlist->el[i].progress == -1) { // delayed while another partition inits 2404 2403 continue; 2405 2404 } -
trunk/mondo/mondo/restore-scripts/mondo/grub-install.patched
r588 r729 257 257 # For now, this uses the program `df' to get the device name, but is 258 258 # this really portable? 259 tmp_fname=`df -P$1/ | sed -n 's%.*\(/dev/[^ ]*\).*%\1%p'`259 tmp_fname=`df $1/ | sed -n 's%.*\(/dev/[^ ]*\).*%\1%p'` 260 260 261 261 if test -z "$tmp_fname"; then -
trunk/mondo/mondo/restore-scripts/mondo/label-partitions-as-necessary
r588 r729 59 59 while [ "$line" != "" ] && [ "$noof_blank_lines" -le "5" ] ; do 60 60 if [ "$line" = "" ] ; then 61 noof_blank_lines=$(($noof_blank_lines+1))61 noof_blank_lines=$(($noof_blank_lines+1)) 62 62 else 63 noof_blank_lines=064 read_partition_line "$line"63 noof_blank_lines=0 64 read_partition_line "$line" 65 65 fi 66 66 read line
Note:
See TracChangeset
for help on using the changeset viewer.