Changeset 1106 in MondoRescue for trunk/mondo/src/common
- Timestamp:
- Feb 7, 2007, 11:55:11 PM (17 years ago)
- Location:
- trunk/mondo/src/common
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/src/common/libmondo-archive.c
r1086 r1106 20 20 #include "mr_mem.h" 21 21 #include "mr_err.h" 22 #include "mr_str.h" 23 #include "mr_file.h" 22 24 23 25 #include "libmondo-string-EXT.h" … … 544 546 /*@ buffer ************************************************************ */ 545 547 char *tmp = NULL; 546 char *tmp1 = NULL;547 char *tmp2 = NULL;548 548 char *command = NULL; 549 549 char *use_lzo_sz = NULL; … … 559 559 char *devs_to_exclude = NULL; 560 560 char *use_lilo_sz = NULL; 561 char *value = NULL;562 561 char *bootdev = NULL; 563 564 562 565 563 /*@ char ************************************************************** */ … … 572 570 int res = 0; 573 571 long estimated_total_noof_slices = 0; 572 573 FILE *fd = NULL; 574 FILE *fd1 = NULL; 574 575 575 576 assert(bkpinfo != NULL); … … 606 607 mr_asprintf(&tape_device, " "); 607 608 } 609 /* BERLIOS: This parameter is not used after? */ 610 mr_free(tape_size_sz); 608 611 if (bkpinfo->use_lzo) { 609 612 mr_asprintf(&use_lzo_sz, "yes"); … … 759 762 mr_asprintf(&tmp, "%s/BOOTLOADER.DEVICE", bkpinfo->tmpdir); 760 763 if (write_one_liner_data_file(tmp, bkpinfo->boot_device)) { 761 mr_msg(1, "%ld: Unable to write one-liner boot device", __LINE__); 762 } 763 mr_free(tmp); 764 /* BERLIOS: Use bkptype_to_string without LANG */ 765 switch (bkpinfo->backup_media_type) { 766 case cdr: 767 mr_asprintf(&value, "cdr"); 768 break; 769 case cdrw: 770 mr_asprintf(&value, "cdrw"); 771 break; 772 case cdstream: 773 mr_asprintf(&value, "cdstream"); 774 break; 775 case tape: 776 mr_asprintf(&value, "tape"); 777 break; 778 case udev: 779 mr_asprintf(&value, "udev"); 780 break; 781 case iso: 782 mr_asprintf(&value, "iso"); 783 break; 784 case nfs: 785 mr_asprintf(&value, "nfs"); 786 break; 787 case dvd: 788 mr_asprintf(&value, "dvd"); 789 break; 790 case usb: 791 strcpy(value, "usb"); 792 break; 793 default: 794 fatal_error("Unknown backup_media_type"); 795 } 796 mr_asprintf(&tmp, "%s/BACKUP-MEDIA-TYPE", bkpinfo->tmpdir); 797 if (write_one_liner_data_file(tmp, value)) { 798 res++; 799 mr_msg(1, "%ld: Unable to write one-liner backup-media-type", 800 __LINE__); 801 } 802 mr_free(value); 803 mr_free(tmp); 804 log_to_screen(bkpinfo->tmpdir); 805 mr_asprintf(&tmp, "%s/BOOTLOADER.NAME", bkpinfo->tmpdir); 806 if (write_one_liner_data_file(tmp, bootldr_str)) { 807 res++; 808 mr_msg(1, "%ld: Unable to write one-liner bootloader.name", 809 __LINE__); 810 } 811 mr_free(bootldr_str); 812 mr_free(tmp); 813 mr_asprintf(&tmp, "%s/DIFFERENTIAL", bkpinfo->tmpdir); 814 if (bkpinfo->differential) { 815 res += write_one_liner_data_file(tmp, "1"); 816 } else { 817 res += write_one_liner_data_file(tmp, "0"); 818 } 819 mr_free(tmp); 820 821 if (g_getfattr) { 822 mr_asprintf(&tmp1, "%s/XATTR", bkpinfo->tmpdir); 823 if (write_one_liner_data_file(tmp1, "TRUE")) { 824 mr_msg(1, "%ld: Unable to write one-liner XATTR", 825 __LINE__); 826 } 827 mr_free(tmp1); 828 } 829 if (g_getfacl) { 830 mr_asprintf(&tmp1, "%s/ACL", bkpinfo->tmpdir); 831 if (write_one_liner_data_file(tmp1, "TRUE")) { 832 mr_msg(1, "%ld: Unable to write one-liner ACL", 833 __LINE__); 834 } 835 mr_free(tmp1); 764 mr_msg(1, "Unable to write one-liner boot device"); 765 836 766 } 837 767 … … 850 780 log_OS_error("Unable to make mnt floppy directory"); 851 781 } 782 783 /* Prepare interface with mindi through a configuration file 784 * under /var/cache/mondo by default 785 * and the mondorestore configuration file at the same time that 786 * will be included by mindi on the initrd */ 787 788 fd = mr_fopen(MONDO_CACHE"/mindi.conf", "w"); 789 fd1 = mr_fopen(MONDORESTORECFG, "a"); 790 791 mr_fprintf(fd, "mindi_kernel=%s\n", bkpinfo->kernel_path); 792 mr_fprintf(fd, "mindi_use_own_kernel=yes\n"); 793 794 mr_fprintf(fd1, "files-in-filelist %ld\n", lines_in_filelist); 795 mr_fprintf(fd1, "internal-tape-block-size %ld\n", bkpinfo->internal_tape_block_size); 796 mr_fprintf(fd1, "total-slices %ld\n", estimated_total_noof_slices); 797 mr_fprintf(fd1, "excluded-devs %s\n", devs_to_exclude); 798 mr_free(devs_to_exclude); 799 mr_fprintf(fd1, "image-devs %s\n", bkpinfo->image_devs); 800 mr_fprintf(fd1, "last-filelist-number %s\n", last_filelist_number); 801 mr_free(last_filelist_number); 802 mr_fprintf(fd1, "bootloader.name %s\n", bootldr_str); 803 mr_free(bootldr_str); 804 mr_fprintf(fd1, "bootloader.device %s\n", bkpinfo->boot_device); 805 806 switch (bkpinfo->backup_media_type) { 807 case cdr: 808 mr_fprintf(fd1, "backup-media-type cdr\n"); 809 break; 810 case cdrw: 811 mr_fprintf(fd1, "backup-media-type cdrw\n"); 812 break; 813 case cdstream: 814 mr_fprintf(fd1, "backup-media-type cdstream\n"); 815 break; 816 case tape: 817 mr_fprintf(fd1, "backup-media-type tape\n"); 818 break; 819 case udev: 820 mr_fprintf(fd1, "backup-media-type udev\n"); 821 break; 822 case iso: 823 mr_fprintf(fd1, "backup-media-type iso\n"); 824 break; 825 case nfs: 826 mr_fprintf(fd1, "backup-media-type nfs\n"); 827 break; 828 case dvd: 829 mr_fprintf(fd1, "backup-media-type dvd\n"); 830 break; 831 case usb: 832 mr_fprintf(fd1, "backup-media-type usb\n"); 833 break; 834 default: 835 fatal_error("Unknown backup_media_type"); 836 } 837 838 if (bkpinfo->backup_media_type == usb) { 839 mr_fprintf(fd, "mindi_write_usb=yes\n"); 840 mr_fprintf(fd, "mindi_usb_device=%s\n", bkpinfo->media_device); 841 } 842 if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) { 843 mr_fprintf(fd, "mindi_write_tape=yes\n"); 844 mr_fprintf(fd, "mindi_tape_device=%s\n", bkpinfo->media_device); 845 mr_fprintf(fd1, "media-dev %s\n", bkpinfo->media_device); 846 mr_fprintf(fd1, "media-size %ld\n", bkpinfo->media_size[1]); 847 } 848 if (bkpinfo->compression_level > 0) { 849 mr_fprintf(fd1, "use-comp yes\n"); 850 } else { 851 mr_fprintf(fd1, "use-comp no\n"); 852 } 853 if (bkpinfo->use_gzip) { 854 mr_fprintf(fd1, "use-gzip yes\n"); 855 } else { 856 mr_fprintf(fd1, "use-gzip no\n"); 857 } 858 if (bkpinfo->use_lzo) { 859 mr_fprintf(fd1, "use-lzo yes\n"); 860 } else { 861 mr_fprintf(fd1, "use-lzo no\n"); 862 } 863 if (bkpinfo->use_star) { 864 mr_fprintf(fd1, "use-star yes\n"); 865 } else { 866 mr_fprintf(fd1, "use-star no\n"); 867 } 868 if (g_getfattr) { 869 mr_fprintf(fd1, "xattr yes\n"); 870 } else { 871 mr_fprintf(fd1, "xattr no\n"); 872 } 873 if (g_getfacl) { 874 mr_fprintf(fd1, "acl yes\n"); 875 } else { 876 mr_fprintf(fd1, "acl no\n"); 877 } 878 879 if (g_cd_recovery) { 880 mr_fprintf(fd1, "use-cdrecovery yes\n"); 881 } else { 882 mr_fprintf(fd1, "use-cdrecovery no\n"); 883 } 884 885 if (bkpinfo->make_cd_use_lilo) { 886 mr_fprintf(fd1, "use-lilo yes\n"); 887 } else { 888 mr_fprintf(fd1, "use-lilo no\n"); 889 } 890 if (bkpinfo->nonbootable_backup) { 891 mr_fprintf(fd1, "non-bootable yes\n"); 892 } else { 893 mr_fprintf(fd1, "non-bootable no\n"); 894 } 895 if (bkpinfo->differential) { 896 mr_fprintf(fd1, "differential 1\n"); 897 } else { 898 mr_fprintf(fd1, "differential 0\n"); 899 } 900 901 mr_fclose(fd); 902 mr_fprintf(fd1, "datestamp %s\n", mr_date()); 903 mr_fclose(fd1); 904 905 mr_asprintf(&command, "mindi --custom '%s' '%s/images'", 906 bkpinfo->tmpdir, bkpinfo->scratchdir); 907 //bkpinfo->tmpdir, // parameter #2 908 //bkpinfo->scratchdir, // parameter #3 909 //bkpinfo->kernel_path, // parameter #4 910 //tape_device, // parameter #5 911 //tape_size_sz, // parameter #6 912 //lines_in_filelist, // parameter #7 (INT) 913 //use_lzo_sz, // parameter #8 914 //cd_recovery_sz, // parameter #9 915 //bkpinfo->image_devs, // parameter #10 916 //broken_bios_sz, // parameter #11 always yes 917 //last_filelist_number, // parameter #12 (STRING) 918 //estimated_total_noof_slices, // parameter #13 (INT) 919 //devs_to_exclude, // parameter #14 920 //use_comp_sz, // parameter #15 921 //use_lilo_sz, // parameter #16 922 //use_star_sz, // parameter #17 923 //bkpinfo->internal_tape_block_size, // parameter #18 (LONG) 924 //bkpinfo->differential, // parameter #19 (INT) 925 //use_gzip_sz); // parameter #20 (STRING) 926 927 mr_msg(2, command); 928 929 930 res = run_program_and_log_to_screen(command, "Generating boot+data disks"); 852 931 mr_free(command); 853 854 mr_asprintf(&tmp, "BTW, I'm telling Mindi your kernel is '%s'",855 bkpinfo->kernel_path);856 log_to_screen(tmp);857 mr_free(tmp);858 859 mr_msg(1, "lines_in_filelist = %ld", lines_in_filelist);860 861 if (bkpinfo->backup_media_type == usb) {862 mr_asprintf(&tmp2, "--usb %s", bkpinfo->media_device);863 } else {864 mr_asprintf(&tmp2,"");865 }866 867 // Watch it! This next line adds a parameter...868 if (bkpinfo->nonbootable_backup) {869 mr_asprintf(&tmp, " NONBOOTABLE");870 } else {871 mr_asprintf(&tmp, " ");872 }873 874 mr_asprintf(&command,875 "mindi %s --custom '%s' '%s/images' '%s' '%s' \876 '%s' %ld '%s' '%s' '%s' \877 '%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s'",878 tmp2,879 bkpinfo->tmpdir, // parameter #2880 bkpinfo->scratchdir, // parameter #3881 bkpinfo->kernel_path, // parameter #4882 tape_device, // parameter #5883 tape_size_sz, // parameter #6884 lines_in_filelist, // parameter #7 (INT)885 use_lzo_sz, // parameter #8886 cd_recovery_sz, // parameter #9887 bkpinfo->image_devs, // parameter #10888 broken_bios_sz, // parameter #11889 last_filelist_number, // parameter #12 (STRING)890 estimated_total_noof_slices, // parameter #13 (INT)891 devs_to_exclude, // parameter #14892 use_comp_sz, // parameter #15893 use_lilo_sz, // parameter #16894 use_star_sz, // parameter #17895 bkpinfo->internal_tape_block_size, // parameter #18 (LONG)896 bkpinfo->differential, // parameter #19 (INT)897 use_gzip_sz, // parameter #20 (STRING)898 tmp);899 mr_free(tmp);900 mr_free(tape_size_sz);901 mr_free(use_lzo_sz);902 mr_free(tape_device);903 mr_free(use_star_sz);904 mr_free(use_comp_sz);905 mr_free(broken_bios_sz);906 mr_free(cd_recovery_sz);907 mr_free(last_filelist_number);908 mr_free(devs_to_exclude);909 mr_free(use_lilo_sz);910 mr_free(use_gzip_sz);911 mr_free(tmp2);912 913 mr_msg(2, command);914 915 // popup_and_OK("Pausing");916 res = run_program_and_log_to_screen(command,917 "Generating boot+data disks");918 mr_free(command);919 920 932 if (bkpinfo->nonbootable_backup) { 921 933 res = 0; … … 1176 1188 closeout_tape(bkpinfo); 1177 1189 } else { 1178 /* write final ISO */1190 /* write final ISO/USB */ 1179 1191 res = write_final_iso_if_necessary(bkpinfo); 1180 1192 retval += res; … … 1868 1880 if (bkpinfo->nonbootable_backup) { 1869 1881 mr_msg(1, "Making nonbootable backup"); 1870 // FIXME --- change mkisofs string to MONDO_MKISOFS_NONBOOTABLE and add ' .' at end1871 1882 res = eval_call_to_make_ISO(bkpinfo, 1872 1883 "mkisofs -o '_ISO_' -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .", … … 3563 3574 bkpinfo->media_size[g_current_media_number]) { 3564 3575 mr_asprintf(&tmp, 3565 "Warning! CD is too big. It occupies %ld KB, which is more than the %ld KB allowed.", 3566 (long) space_occupied_by_cd(bkpinfo->scratchdir), 3567 (long) bkpinfo->media_size[g_current_media_number]); 3576 "Warning! %s is too big. It occupies %ld KB, which is more than the %ld KB allowed.", 3577 media_descriptor_string(bkpinfo->backup_media_type), 3578 (long) space_occupied_by_cd(bkpinfo->scratchdir), 3579 (long) bkpinfo->media_size[g_current_media_number]); 3568 3580 log_to_screen(tmp); 3569 3581 mr_free(tmp); 3570 3582 } 3571 mr_asprintf(&isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir, 3572 bkpinfo->nfs_remote_dir, bkpinfo->prefix, 3573 g_current_media_number); 3583 if (bkpinfo->backup_media_type != usb) { 3584 mr_asprintf(&isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir, 3585 bkpinfo->nfs_remote_dir, bkpinfo->prefix, 3586 g_current_media_number); 3587 } else { 3588 } 3574 3589 for (that_one_was_ok = FALSE; !that_one_was_ok;) { 3575 res = make_iso_fs(bkpinfo, isofile); 3590 if (bkpinfo->backup_media_type != usb) { 3591 res = make_iso_fs(bkpinfo, isofile); 3592 } else { 3593 } 3576 3594 if (g_current_media_number == 1 && !res 3577 3595 && (bkpinfo->backup_media_type == cdr … … 3854 3872 3855 3873 setenv("MONDO_SHARE", MONDO_SHARE, 1); 3874 setenv("MONDORESTORECFG", MONDORESTORECFG, 1); 3875 setenv("MONDO_CACHE", MONDO_CACHE, 1); 3856 3876 } 3857 3877 -
trunk/mondo/src/common/libmondo-devices.h
r783 r1106 2 2 * $Id$ 3 3 */ 4 5 #ifndef LIBMONDO_DEVICES_H 6 # define LIBMONDO_DEVICES_H 4 7 5 8 bool am_I_in_disaster_recovery_mode(void); … … 36 39 int eject_device(char *); 37 40 38 char *list_of_NFS_mounts_only( );41 char *list_of_NFS_mounts_only(void); 39 42 40 43 void sensibly_set_tmpdir_and_scratchdir(struct s_bkpinfo *bkpinfo); … … 57 60 char *which_partition_format(const char *drive); 58 61 char *bkptype_to_string(t_bkptype bt); 62 63 #endif /* LIBMONDO_DEVICES_H */ -
trunk/mondo/src/common/libmondo-fifo-EXT.h
r59 r1106 4 4 long internal_block_size); 5 5 extern void sigpipe_occurred(int); 6 extern void kill_buffer( );6 extern void kill_buffer(void); -
trunk/mondo/src/common/libmondo-filelist.c
r1086 r1106 395 395 396 396 397 int call_exe_and_pipe_output_to_fd(char *sys call, FILE * pout)397 int call_exe_and_pipe_output_to_fd(char *sys_call, FILE * pout) 398 398 { 399 399 FILE *pattr; … … 401 401 size_t n = 0; 402 402 403 pattr = popen(sys call, "r");403 pattr = popen(sys_call, "r"); 404 404 if (!pattr) { 405 mr_msg(1, "Failed to open fattr() %s", sys call);405 mr_msg(1, "Failed to open fattr() %s", sys_call); 406 406 return (1); 407 407 } 408 408 if (feof(pattr)) { 409 mr_msg(1, "Failed to call fattr() %s", sys call);409 mr_msg(1, "Failed to call fattr() %s", sys_call); 410 410 paranoid_pclose(pattr); 411 411 return (2); … … 426 426 FILE *pout; 427 427 char *pout_command; 428 char *sys call;428 char *sys_call; 429 429 char *file_to_analyze = NULL; 430 430 char *strtmp = NULL; … … 454 454 /* BERLIOS : to be checked */ 455 455 mr_asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", '\\')); 456 mr_asprintf(&sys call, "%s 2>> /dev/null", strtmp);456 mr_asprintf(&sys_call, "%s 2>> /dev/null", strtmp); 457 457 mr_free(strtmp); 458 call_exe_and_pipe_output_to_fd(sys call, pout);459 mr_free(sys call);458 call_exe_and_pipe_output_to_fd(sys_call, pout); 459 mr_free(sys_call); 460 460 } 461 461 paranoid_fclose(fin); -
trunk/mondo/src/common/libmondo-files.c
r1086 r1106 19 19 #include "libmondo-string-EXT.h" 20 20 #include "mr_mem.h" 21 22 #include "mr_file.h" 21 23 22 24 /*@unused@*/ … … 1044 1046 char *command = NULL; 1045 1047 1048 FILE *fd1 = NULL; 1049 1046 1050 /*@ pointers ***** */ 1047 1051 char *p; … … 1096 1100 ("Unable to find ethN (eth0, eth1, ...) adapter via NFS mount you specified."); 1097 1101 } 1098 make_hole_for_dir("/var/cache/mondo-archive");1099 1102 /******** 1100 1103 * If the NFS device that found above is a bonded device, … … 1121 1124 } 1122 1125 1123 mr_asprintf(&tmp, "%s/NFS-DEV", bkpinfo->tmpdir);1124 write_one_liner_data_file(tmp, nfs_dev);1125 1126 mr_free(nfs_dev); 1126 1127 mr_free(tmp); 1127 1128 1128 mr_asprintf(&tmp, "%s/NFS-CLIENT-IPADDR", bkpinfo->tmpdir); 1129 write_one_liner_data_file(tmp, nfs_client_ipaddr); 1130 mr_free(nfs_client_ipaddr); 1131 mr_free(tmp); 1132 1133 mr_asprintf(&tmp, "%s/NFS-CLIENT-NETMASK", bkpinfo->tmpdir); 1134 write_one_liner_data_file(tmp, nfs_client_netmask); 1135 mr_free(nfs_client_netmask); 1136 mr_free(tmp); 1137 1138 mr_asprintf(&tmp, "%s/NFS-CLIENT-DEFGW", bkpinfo->tmpdir); 1139 write_one_liner_data_file(tmp, nfs_client_defgw); 1140 mr_free(nfs_client_defgw); 1141 mr_free(tmp); 1142 1143 mr_asprintf(&tmp, "%s/NFS-CLIENT-BROADCAST", bkpinfo->tmpdir); 1144 write_one_liner_data_file(tmp, nfs_client_broadcast); 1145 mr_free(nfs_client_broadcast); 1146 mr_free(tmp); 1147 1148 mr_asprintf(&tmp, "%s/NFS-SERVER-IPADDR", bkpinfo->tmpdir); 1149 write_one_liner_data_file(tmp, nfs_server_ipaddr); 1150 mr_free(nfs_server_ipaddr); 1151 mr_free(tmp); 1152 1153 mr_asprintf(&tmp, "%s/NFS-SERVER-MOUNT", bkpinfo->tmpdir); 1154 write_one_liner_data_file(tmp, bkpinfo->nfs_mount); 1155 mr_free(tmp); 1156 1157 mr_asprintf(&tmp, "%s/NFS-SERVER-PATH", bkpinfo->tmpdir); 1158 write_one_liner_data_file(tmp, bkpinfo->nfs_remote_dir); 1159 mr_free(tmp); 1160 1161 mr_asprintf(&tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir); 1162 write_one_liner_data_file(tmp, bkpinfo->prefix); 1163 mr_free(tmp); 1129 fd1 = mr_fopen(MONDORESTORECFG, "a"); 1130 mr_fprintf(fd1, "nfs-dev %s\n", nfs_dev); 1131 mr_fprintf(fd1, "nfs-client-ipaddr %s\n", nfs_client_ipaddr); 1132 mr_fprintf(fd1, "nfs-client-netmask %s\n", nfs_client_netmask); 1133 mr_fprintf(fd1, "nfs-client-broadcast %s\n", nfs_client_broadcast); 1134 mr_fprintf(fd1, "nfs-client-defgw %s\n", nfs_client_defgw); 1135 mr_fprintf(fd1, "nfs-server-ipaddr %s\n", nfs_server_ipaddr); 1136 mr_fprintf(fd1, "nfs-server-mount %s\n", bkpinfo->nfs_mount); 1137 mr_fprintf(fd1, "nfs-server-path %s\n", bkpinfo->nfs_remote_dir); 1138 mr_fprintf(fd1, "iso-prefix %s\n", bkpinfo->prefix); 1139 mr_fclose(fd1); 1164 1140 1165 1141 log_it("Finished storing NFS configuration"); -
trunk/mondo/src/common/libmondo-raid.c
r1086 r1106 214 214 */ 215 215 void add_disk_to_raid_device(struct list_of_disks *disklist, 216 char *device_to_add, int i ndex)216 char *device_to_add, int idx) 217 217 { 218 218 int items; … … 222 222 items = disklist->entries; 223 223 strcpy(disklist->el[items].device, device_to_add); 224 disklist->el[items].index = i ndex;224 disklist->el[items].index = idx; 225 225 items++; 226 226 disklist->entries = items; … … 652 652 653 653 struct list_of_disks *disklist = NULL; 654 int index = 0;655 654 int v = 0; 656 655 … … 708 707 mr_free(tmp); 709 708 } else { 710 index = atoi(valueB); 711 add_disk_to_raid_device(disklist, value, index); 709 add_disk_to_raid_device(disklist, value, atoi(valueB)); 712 710 } 713 711 mr_free(labelB); -
trunk/mondo/src/common/libmondo-tools-EXT.h
r171 r1106 1 /* libmondo-tools-EXT.h */ 1 /* $Id$ */ 2 3 #ifndef LIBMONDO_TOOLS_EXT_H 4 #define LIBMONDO_TOOLS_EXT_H 2 5 3 6 extern void clean_up_KDE_desktop_if_necessary(void); 4 extern long get_time( );7 extern long get_time(void); 5 8 extern void (*log_debug_msg) (int debug_level, const char *szFile, 6 9 const char *szFunction, int nLine, … … 17 20 extern void initialize_raidrec(struct raid_device_record *raidrec); 18 21 #endif 19 extern int some_basic_system_sanity_checks( );22 extern int some_basic_system_sanity_checks(void); 20 23 21 24 … … 40 43 extern void free_libmondo_global_strings(void); 41 44 42 extern double get_kernel_version( );43 extern char *get_architecture( );45 extern double get_kernel_version(void); 46 extern char *get_architecture(void); 44 47 45 48 extern bool does_nonMS_partition_exist(void); … … 48 51 extern void stop_magicdev_if_necessary(void); 49 52 extern void restart_magicdev_if_necessary(void); 53 54 #endif /* LIBMONDO_TOOLS_EXT_H */ -
trunk/mondo/src/common/libmondo-tools.c
r1086 r1106 10 10 #include "my-stuff.h" 11 11 #include "mr_mem.h" 12 #include "mr_file.h" 13 12 14 #include "mondostructures.h" 13 15 #include "libmondo-tools.h" … … 362 364 int rdsiz_MB; 363 365 char *iso_path = NULL; 366 FILE *fd1 = NULL; 364 367 365 368 assert(bkpinfo != NULL); … … 592 595 bkpinfo->isodir); 593 596 log_it("command = %s", command); 594 tmp= call_program_and_get_last_line_of_output(command);597 iso_dev = call_program_and_get_last_line_of_output(command); 595 598 mr_free(command); 596 log_it("res of it = %s", tmp);597 mr_asprintf(&tmp1, "%s/ISO-DEV", bkpinfo->tmpdir); 598 write_one_liner_data_file(tmp1, tmp);599 mr_f ree(tmp1);599 log_it("res of it = %s", iso_dev); 600 601 fd1 = mr_fopen(MONDORESTORECFG, "a"); 602 mr_fprintf(fd1, "iso-dev %s\n", iso_dev); 600 603 601 604 mr_asprintf(&command, "mount | grep -w %s | tail -n1 | cut -d' ' -f3", 602 tmp); 603 mr_free(tmp); 605 iso_dev); 606 mr_free(iso_dev); 607 604 608 log_it("command = %s", command); 605 tmp= call_program_and_get_last_line_of_output(command);609 iso_mnt = call_program_and_get_last_line_of_output(command); 606 610 mr_free(command); 607 log_it("res of it = %s", tmp); 608 609 mr_asprintf(&tmp1, "%s/ISO-MNT", bkpinfo->tmpdir); 610 write_one_liner_data_file(tmp1, tmp); 611 mr_free(tmp1); 612 613 log_it("isomnt: %s, %d", tmp, strlen(tmp)); 614 if (strlen(bkpinfo->isodir) < strlen(tmp)) { 615 mr_asprintf(&iso_path, " "); 616 } else { 617 mr_asprintf(&iso_path, "%s", bkpinfo->isodir + strlen(tmp)); 618 } 619 mr_free(tmp); 620 621 mr_asprintf(&tmp, "%s/ISODIR", bkpinfo->tmpdir); 622 write_one_liner_data_file(tmp, iso_path); 623 mr_free(tmp); 611 612 log_it("res of it = %s", iso_mnt); 613 mr_fprintf(fd1, "iso-mnt %s\n", iso_mnt); 614 log_it("isomnt: %s, %d", iso_mnt, strlen(iso_mnt)); 615 616 mr_asprintf(&iso_tmp, "%s", bkpinfo->isodir); 617 if (strlen(iso_tmp) >= strlen(iso_mnt)) { 618 mr_asprintf(&iso_path, "%s", iso_tmp + strlen(iso_mnt)); 619 } 620 mr_free(iso_tmp); 621 mr_free(iso_mnt); 622 624 623 log_it("isodir: %s", iso_path); 624 mr_fprintf(fd1, "isodir %s\n", iso_path); 625 625 mr_free(iso_path); 626 mr_asprintf(&tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir); 627 write_one_liner_data_file(tmp, bkpinfo->prefix); 626 628 627 log_it("iso-prefix: %s", bkpinfo->prefix); 629 mr_free(tmp); 630 /* End patch */ 628 mr_fprintf(fd1, "iso-prefix %s\n", bkpinfo->prefix); 629 630 mr_fclose(fd1); 631 631 } // end of iso code 632 632 -
trunk/mondo/src/common/libmondo-tools.h
r171 r1106 3 3 */ 4 4 5 #ifndef LIBMONDO_TOOLS_H 6 # define LIBMONDO_TOOLS_H 7 5 8 void clean_up_KDE_desktop_if_necessary(void); 6 9 7 long get_time( );10 long get_time(void); 8 11 extern void (*log_debug_msg) (int debug_level, const char *szFile, 9 12 const char *szFunction, int nLine, … … 20 23 void initialize_raidrec(struct raid_device_record *raidrec); 21 24 #endif 22 int some_basic_system_sanity_checks( );25 int some_basic_system_sanity_checks(void); 23 26 24 27 … … 45 48 void free_libmondo_global_strings(void); 46 49 47 double get_kernel_version( );48 char *get_architecture( );50 double get_kernel_version(void); 51 char *get_architecture(void); 49 52 bool does_nonMS_partition_exist(void); 50 53 void stop_magicdev_if_necessary(void); 51 54 void restart_magicdev_if_necessary(void); 55 56 #endif /* LIBMONDO_TOOLS_H */ -
trunk/mondo/src/common/newt-specific-EXT.h
r688 r1106 5 5 extern bool ask_me_OK_or_cancel(char *prompt); 6 6 extern void close_evalcall_form(void); 7 extern void close_progress_form( );7 extern void close_progress_form(void); 8 8 extern void fatal_error(char *error_string); 9 9 extern void finish(int signal); … … 17 17 extern bool popup_and_get_string(char *title, char *b, char *output); 18 18 extern bool popup_with_buttons(char *p, char *button1, char *button2); 19 extern void refresh_log_screen( );20 extern void setup_newt_stuff( );19 extern void refresh_log_screen(void); 20 extern void setup_newt_stuff(void); 21 21 extern void update_evalcall_form_ratio(int num, int denom); 22 22 extern void update_evalcall_form(int curr); … … 30 30 31 31 extern t_bkptype which_backup_media_type(bool); 32 extern int which_compression_level( );32 extern int which_compression_level(void); 33 33 34 34 -
trunk/mondo/src/common/newt-specific.c
r1086 r1106 351 351 */ 352 352 void 353 finish(int signal ) {353 finish(int signal_code) { 354 354 char *command = NULL; 355 355 356 <<<<<<< .courant 357 ======= 358 /* if (signal_code==0) { popup_and_OK("Please press <enter> to quit."); } */ 359 360 /* newtPopHelpLine(); */ 361 362 >>>>>>> .fusion-droit.r1105 356 363 register_pid(0, "mondo"); 357 364 chdir("/"); … … 378 385 } 379 386 } 387 <<<<<<< .courant 380 388 printf(_("Execution run ended; result=%d\n"), signal); 381 389 printf(_("Type 'less %s' to see the output log\n"), MONDO_LOGFILE); 390 ======= 391 // system("clear"); 392 // iamhere("Finished calling newtFinished"); 393 printf("Execution run ended; result=%d\n", signal_code); 394 printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE); 395 >>>>>>> .fusion-droit.r1105 382 396 free_libmondo_global_strings(); 383 exit(signal );397 exit(signal_code); 384 398 } 385 399 … … 650 664 void 651 665 popup_and_OK(char *prompt) { 652 charch;666 int ch; 653 667 654 668 assert_string_is_neither_NULL_nor_zerolength(prompt); -
trunk/mondo/src/common/newt-specific.h
r688 r1106 3 3 */ 4 4 5 5 #ifndef NEWT_SPECIFIC_H 6 # define NEWT_SPECIFIC_H 6 7 #ifndef H_NEWT 7 8 #include <newt.h> … … 11 12 bool ask_me_OK_or_cancel(char *prompt); 12 13 void close_evalcall_form(void); 13 void close_progress_form( );14 void close_progress_form(void); 14 15 void fatal_error(char *error_string); 15 16 void finish(int signal); … … 23 24 bool popup_and_get_string(char *title, char *b, char *output); 24 25 bool popup_with_buttons(char *p, char *button1, char *button2); 25 void refresh_log_screen( );26 void setup_newt_stuff( );26 void refresh_log_screen(void); 27 void setup_newt_stuff(void); 27 28 void update_evalcall_form_ratio(int num, int denom); 28 29 void update_evalcall_form(int curr); … … 36 37 37 38 t_bkptype which_backup_media_type(bool); 38 int which_compression_level( );39 int which_compression_level(void); 39 40 40 41 41 42 void popup_changelist_from_file(char *source_file); 43 44 #endif /* NEWT_SPECIFIC_H */ 45
Note:
See TracChangeset
for help on using the changeset viewer.