Changeset 764 in MondoRescue for trunk/mondo
- Timestamp:
- Aug 8, 2006, 12:34:37 AM (18 years ago)
- Location:
- trunk/mondo
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/ChangeLog
r729 r764 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-07-30) 10 2.0.9 (2006-08-04) 11 - Preliminary build process working for Debian and Gentoo (Bruno Cornec) 12 - New NFS/PXE support. start-nfs is now a fixed script. Allow more possibilities at restore time (Bruno Cornec) 13 - Fix some compiler warnings for 64bits mode (Andree Leidenfrost) 11 14 - Fix various screen corruption for 'Configure LVM'/RAID sync (Andree Leidenfrost) 12 15 - SuSE RPMS now use bzip2 (Lars Rupp/Bruno Cornec) 13 - Exclude mvfs type of filesystem (ClearCase) from mondo backup (Bruno Cornec)16 - Exclude ClearCase mvfs type of filesystem from mondo backup (rzonum_at_gmail.com/Bruno Cornec) 14 17 - Improved .spec Requires (Fedora/SuSE feedbacks) (Bruno Cornec) 18 - Indication for users of IDE burners and 2.6 kernels (Christopher Moriarity/Bruno Cornec) 19 - remove df -P during restore as busybox doesn't support it (Bruno Cornec) 15 20 - nfsmount option added to allow redeployment from another NFS server (Bruno Cornec) 21 - This version should work a bit better with files having special char bug #7421 - but more to come (Bruno Cornec) 22 - Fix Debian Bug #369321 by increasing MAX_TAPECATALOG_ENTRIES to 8192 and bkpinfo->optimal_set_size to 16MB (Andree Leidenfrost) 23 - Fix problem with BurnProof+DVD (Andree Leidenfrost) 24 - Fix bug #7820: mondo should now support files > 2GB (taps23_at_yahoo.com/Bruno Cornec) 16 25 - Replaced all occurrences of egrep with 'grep -E' and of fgrep with 'grep -F' (Andree Leidenfrost) 17 26 - Optimize grep usage - fixes Debian bug #222052 (Andree Leidenfrost) -
trunk/mondo/README
r270 r764 28 28 29 29 You can get the latest packages from 30 http://developer.berlios.de/project/showfiles.php?group_id=2524. 30 ftp://ftp.mondorescue.org 31 31 32 32 Please see file 'INSTALL' for instructions about how to build and install … … 50 50 51 51 Apart from the above-mentioned documentation, there is a Wiki with growing 52 contents at the following URL: http:// developer.berlios.de/wiki/?group_id=2524.52 contents at the following URL: http://www.mondorescue.org/cgi-bin/trac.cgi/wiki 53 53 54 54 Also, there is a mailing list mondo-devel@lists.sourceforge.net. Please go to -
trunk/mondo/distributions/gentoo/mondo.ebuild
r588 r764 9 9 DESCRIPTION="The premier GPL disaster recovery solution." 10 10 HOMEPAGE="http://www.mondorescue.org" 11 SRC_URI="ftp://ftp.mondore cue.org/src/${PN/-rescue/}-${PV}-${PR}.tgz"11 SRC_URI="ftp://ftp.mondorescue.org/src/${PN/-rescue/}-${PV}.tar.gz" 12 12 13 13 LICENSE="GPL-2" … … 29 29 >=sys-boot/syslinux-1.52" 30 30 31 S=${WORKDIR}/${PN/-rescue/}-${PV} -${PR}31 S=${WORKDIR}/${PN/-rescue/}-${PV} 32 32 33 33 src_unpack() { -
trunk/mondo/distributions/mandriva/spec.m4
r729 r764 2 2 dnl 3 3 dnl SSS is replaced by the source package format 4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version} -TTT.tar.bz2')dnl4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.bz2')dnl 5 5 dnl DDD is replaced by the list of dependencies specific to that distro 6 6 define(`DDD', )dnl -
trunk/mondo/distributions/redhat/spec.m4
r729 r764 2 2 dnl 3 3 dnl SSS is replaced by the source package format 4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version} -TTT.tar.gz')dnl4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}.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
r729 r764 3 3 # 4 4 5 %define addreq mindi >= 1.0. 7, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, DDD5 %define addreq mindi >= 1.0.9, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, DDD 6 6 7 7 Summary: A program which a Linux user can utilize to create a rescue/restore CD/tape -
trunk/mondo/distributions/suse/spec.m4
r729 r764 2 2 dnl 3 3 dnl SSS is replaced by the source package format 4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version} -TTT.tar.bz2')dnl4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}.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 -
trunk/mondo/mondo/Makefile.am
r729 r764 4 4 pkgdata_DATA = do-not-compress-these 5 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 6 script_SCRIPTS = autorun -
trunk/mondo/mondo/common/libmondo-files.c
r689 r764 1058 1058 1059 1059 /*@ buffers ******** */ 1060 char *outfile = NULL;1061 1060 char *nfs_dev = NULL; 1062 1061 char *nfs_mount = NULL; … … 1071 1070 /*@ pointers ***** */ 1072 1071 char *p; 1073 FILE *fout;1074 1075 1076 1072 1077 1073 log_it("Storing NFS configuration"); … … 1123 1119 ("Unable to find ethN (eth0, eth1, ...) adapter via NFS mount you specified."); 1124 1120 } 1125 asprintf(&outfile, "%s/start-nfs", bkpinfo->tmpdir);1126 asprintf(&tmp, "outfile = %s", outfile);1127 log_it(tmp);1128 paranoid_free(tmp);1129 1130 if (!(fout = fopen(outfile, "w"))) {1131 fatal_error("Cannot store NFS config");1132 }1133 fprintf(fout, "#!/bin/sh\n");1134 fprintf(fout, "# number of ping\n");1135 fprintf(fout, "ipcount=3\n");1136 fprintf(fout, "for i in `cat /proc/cmdline` ; do\n");1137 fprintf(fout, " echo $i | grep -qi ping= && ipcount=`echo $i | cut -d= -f2`\n");1138 fprintf(fout, "done\n");1139 fprintf(fout, "ifconfig lo 127.0.0.1 # config loopback\n");1140 fprintf(fout, "ipdev=%s\n", nfs_dev);1141 fprintf(fout, "ipaddress=%s\n", nfs_client_ipaddr);1142 fprintf(fout, "ipnetmask=%s\n", nfs_client_netmask);1143 fprintf(fout, "ipbroadcast=%s\n", nfs_client_broadcast);1144 fprintf(fout, "ipgateway=%s\n", nfs_client_defgw);1145 fprintf(fout, "ipconf=\n");1146 fprintf(fout, "nfsmount=%s\n", bkpinfo->nfs_mount);1147 fprintf(fout, "for i in `cat /proc/cmdline` ; do\n");1148 fprintf(fout, " echo $i | grep -qi ipconf= && ipconf=`echo $i | cut -d= -f2`\n");1149 fprintf(fout, " echo $i | grep -qi nfsmount= && nfsmount=`echo $i | cut -d= -f2`\n");1150 fprintf(fout, "done\n");1151 fprintf(fout, "nfs_server_ipaddr=`echo $nfsmount | cut -d: -f1`\n");1152 fprintf(fout, "echo \"$ipconf\" | grep -q \"dhcp\"\n");1153 fprintf(fout, "if [ $? -eq 0 ]; then\n");1154 fprintf(fout, " ipdev=`echo $ipconf | cut -d: -f1`\n");1155 fprintf(fout, " echo \"Making DHCP request on $ipdev\"\n");1156 fprintf(fout, " udhcpc -i $ipdev\n");1157 fprintf(fout, "else\n");1158 fprintf(fout, " if [ \"$ipconf\" != \"\" ]; then\n");1159 fprintf(fout, " ipdev=`echo $ipconf | cut -d: -f1`\n");1160 fprintf(fout, " ipaddress=`echo $ipconf | cut -d: -f2`\n");1161 fprintf(fout, " ipnetmask=`echo $ipconf | cut -d: -f3`\n");1162 fprintf(fout, " ipbroadcast=`echo $ipconf | cut -d: -f4`\n");1163 fprintf(fout, " ipgateway=`echo $ipconf | cut -d: -f5`\n");1164 fprintf(fout, " fi\n");1165 fprintf(fout, " ifconfig $ipdev $ipaddress netmask $ipnetmask broadcast $ipbroadcast\n");1166 fprintf(fout, " route add default gw $ipgateway\n");1167 fprintf(fout, "fi\n");1168 fprintf(fout, "ping -c $ipcount $nfs_server_ipaddr # ping server\n");1169 fprintf(fout, "mount -t nfs -o nolock $nfsmount /tmp/isodir\n");1170 paranoid_fclose(fout);1171 chmod(outfile, 0777);1172 1121 make_hole_for_dir("/var/cache/mondo-archive"); 1173 1174 // paranoid_system ("mkdir -p /var/cache/mondo-archive 2> /dev/null");1175 1176 asprintf(&tmp, "cp -f %s /var/cache/mondo-archive", outfile);1177 paranoid_free(outfile);1178 1179 run_program_and_log_output(tmp, FALSE);1180 paranoid_free(tmp);1181 1122 1182 1123 asprintf(&tmp, "%s/NFS-DEV", bkpinfo->tmpdir); -
trunk/mondo/mondo/common/newt-specific.c
r688 r764 1457 1457 1458 1458 /*@ int ************************************************************* */ 1459 int i = 0;1460 1459 int currline = 0; 1461 1460 int finished = FALSE; 1461 1462 /*@ long ************************************************************ */ 1463 long i = 0; 1462 1464 long lng = 0; 1463 1465 … … 1504 1506 } 1505 1507 asprintf(&differ_sz, 1506 _(" % d files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list."),1508 _(" %ld files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list."), 1507 1509 i); 1508 1510 newtPushHelpLine(differ_sz); -
trunk/mondo/mondo/mondorestore/mondo-prep.c
r729 r764 2190 2190 #else 2191 2191 asprintf(&program, "raidstart %s", raid_device); 2192 // sprintf (program, "raidstart " RAID_DEVICE_STUB "*");2193 2192 #endif 2194 2193 log_msg(1, "program = %s", program); -
trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c
r729 r764 883 883 static int lines_in_flist_window = 0; 884 884 static int depth = 0; 885 int i = 0; 885 886 /** long **************************************************************/ 887 long i = 0; 886 888 887 889 /** structures *******************************************************/ … … 1363 1365 paranoid_free(size_str); 1364 1366 1365 newtListboxSetEntry(listbox, ( int) keylist[currline],1367 newtListboxSetEntry(listbox, (long) keylist[currline], 1366 1368 mountlist_entry_to_string(mountlist, currline)); 1367 1369 /* if new /dev/md RAID device then do funky stuff */ … … 2489 2491 { 2490 2492 2491 /** int*************************************************************/2492 inti = 0;2493 /** long **************************************************************/ 2494 long i = 0; 2493 2495 2494 2496 assert(disklist != NULL); … … 2521 2523 { 2522 2524 2523 /** int**************************************************************/2524 inti = 0;2525 /** long **************************************************************/ 2526 long i = 0; 2525 2527 2526 2528 assert(mountlist != NULL); … … 2554 2556 { 2555 2557 2556 /** int **************************************************************/2557 inti = 0;2558 /** long *************************************************************/ 2559 long i = 0; 2558 2560 2559 2561 /** buffers **********************************************************/ … … 2590 2592 void *keylist[], newtComponent listbox) 2591 2593 { 2592 /** int *************************************************************/2593 inti = 0;2594 /** long ************************************************************/ 2595 long i = 0; 2594 2596 2595 2597 /** buffers *********************************************************/ -
trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c
r729 r764 2155 2155 asprintf(&command, "mount /dev/fd0u1722 %s", mountpt); 2156 2156 asprintf(&tmp, 2157 "(sleep 15; kill `ps ax| grep \"%s\" | cut -d' ' -f1` 2> /dev/null) &",2157 "(sleep 15; kill `ps | grep \"%s\" | cut -d' ' -f1` 2> /dev/null) &", 2158 2158 command); 2159 2159 log_msg(1, "tmp = '%s'", tmp);
Note:
See TracChangeset
for help on using the changeset viewer.