Changeset 2406 in MondoRescue for branches/2.2.10/mondo/src
- Timestamp:
- Sep 17, 2009, 6:21:53 PM (15 years ago)
- Location:
- branches/2.2.10/mondo/src/common
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mondo/src/common/libmondo-archive.c
r2405 r2406 771 771 fatal_error("Unknown backup_media_type"); 772 772 } 773 mr_free(value); 774 773 775 if ((bkpinfo->backup_media_type == usb) && (bkpinfo->media_device)) { 774 776 mr_asprintf(tmp2, "--usb %s", bkpinfo->media_device); … … 777 779 } 778 780 779 mr_asprintf(tmp, "%s/BACKUP-MEDIA-TYPE", bkpinfo->tmpdir);780 if (write_one_liner_data_file(tmp, value)) {781 res++;782 log_msg(1, "%ld: Unable to write one-liner backup-media-type", __LINE__);783 }784 mr_free(value);785 mr_free(tmp);786 787 781 mr_asprintf(tmp, "%s/BOOTLOADER.NAME", bkpinfo->tmpdir); 788 782 if (write_one_liner_data_file(tmp, bootldr_str)) { … … 792 786 mr_free(bootldr_str); 793 787 mr_free(tmp); 794 795 mr_asprintf(tmp, "%s/DIFFERENTIAL", bkpinfo->tmpdir);796 if (bkpinfo->differential) {797 res += write_one_liner_data_file(tmp, "1");798 } else {799 res += write_one_liner_data_file(tmp, "0");800 }801 mr_free(tmp);802 803 if (g_getfattr) {804 mr_asprintf(tmp1, "%s/XATTR", bkpinfo->tmpdir);805 if (write_one_liner_data_file(tmp1, "TRUE")) {806 log_msg(1, "%ld: Unable to write one-liner XATTR",807 __LINE__);808 }809 mr_free(tmp1);810 }811 if (g_getfacl) {812 mr_asprintf(tmp1, "%s/ACL", bkpinfo->tmpdir);813 if (write_one_liner_data_file(tmp1, "TRUE")) {814 log_msg(1, "%ld: Unable to write one-liner ACL", __LINE__);815 }816 mr_free(tmp1);817 }818 if (bkpinfo->use_obdr) {819 mr_asprintf(tmp1, "%s/OBDR", bkpinfo->tmpdir);820 if (write_one_liner_data_file(tmp1, "TRUE")) {821 log_msg(1, "%ld: Unable to write one-liner OBDR", __LINE__);822 }823 mr_free(tmp1);824 }825 788 826 789 estimated_total_noof_slices = size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1; -
branches/2.2.10/mondo/src/common/libmondo-files.c
r2383 r2406 1154 1154 mr_free(tmp); 1155 1155 1156 mr_asprintf(tmp, "%s/NETFS-PROTO", bkpinfo->tmpdir);1157 write_one_liner_data_file(tmp, bkpinfo->netfs_proto);1158 1159 mr_asprintf(tmp, "%s/NETFS-CLIENT-IPADDR", bkpinfo->tmpdir);1160 write_one_liner_data_file(tmp, netfs_client_ipaddr);1161 mr_free(netfs_client_ipaddr);1162 mr_free(tmp);1163 1164 mr_asprintf(tmp, "%s/NETFS-CLIENT-NETMASK", bkpinfo->tmpdir);1165 write_one_liner_data_file(tmp, netfs_client_netmask);1166 mr_free(netfs_client_netmask);1167 mr_free(tmp);1168 1169 mr_asprintf(tmp, "%s/NETFS-CLIENT-BROADCAST", bkpinfo->tmpdir);1170 write_one_liner_data_file(tmp, netfs_client_broadcast);1171 mr_free(netfs_client_broadcast);1172 mr_free(tmp);1173 1174 mr_asprintf(tmp, "%s/NETFS-CLIENT-DEFGW", bkpinfo->tmpdir);1175 write_one_liner_data_file(tmp, netfs_client_defgw);1176 mr_free(netfs_client_defgw);1177 mr_free(tmp);1178 1179 mr_asprintf(tmp, "%s/NETFS-SERVER-IPADDR", bkpinfo->tmpdir);1180 write_one_liner_data_file(tmp, netfs_server_ipaddr);1181 mr_free(tmp);1182 mr_free(netfs_server_ipaddr);1183 1184 1156 mr_asprintf(tmp, "%s/NETFS-SERVER-MOUNT", bkpinfo->tmpdir); 1185 1157 write_one_liner_data_file(tmp, bkpinfo->netfs_mount); … … 1189 1161 mr_asprintf(tmp, "%s/NETFS-SERVER-PATH", bkpinfo->tmpdir); 1190 1162 write_one_liner_data_file(tmp, bkpinfo->netfs_remote_dir); 1191 mr_free(tmp);1192 1193 mr_asprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);1194 write_one_liner_data_file(tmp, bkpinfo->prefix);1195 1163 mr_free(tmp); 1196 1164 -
branches/2.2.10/mondo/src/common/libmondo-tools.c
r2405 r2406 616 616 iso_dev = call_program_and_get_last_line_of_output(command); 617 617 log_it("res of it = %s", iso_dev); 618 mr_asprintf(tmp, "%s/ISO-DEV", bkpinfo->tmpdir);619 write_one_liner_data_file(tmp, iso_dev);620 mr_free(tmp);621 618 mr_free(command); 622 619 … … 627 624 iso_mnt = call_program_and_get_last_line_of_output(command); 628 625 log_it("res of it = %s", iso_mnt); 629 mr_asprintf(tmp, "%s/ISO-MNT", bkpinfo->tmpdir);630 write_one_liner_data_file(tmp, iso_mnt);631 mr_free(tmp);632 626 mr_free(command); 633 627 … … 642 636 mr_free(iso_tmp); 643 637 644 mr_asprintf(tmp, "%s/ISODIR", bkpinfo->tmpdir);645 write_one_liner_data_file(tmp, iso_path);646 mr_free(tmp);647 648 638 log_it("isodir: %s", iso_path); 649 639 mr_free(iso_path); 650 651 mr_asprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);652 write_one_liner_data_file(tmp, bkpinfo->prefix);653 mr_free(tmp);654 640 655 641 log_it("iso-prefix: %s", bkpinfo->prefix);
Note:
See TracChangeset
for help on using the changeset viewer.