Changeset 903 in MondoRescue for trunk/mondo/src
- Timestamp:
- Oct 25, 2006, 1:49:52 AM (17 years ago)
- Location:
- trunk/mondo/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/src/common/libmondo-devices.c
r900 r903 1578 1578 if (bkpinfo->media_device != NULL) { 1579 1579 mr_asprintf(&tmp, 1580 _("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."),1580 _("I think I've found your %s burner at SCSI node %s; Is this correct ? (say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details."), 1581 1581 bkpinfo->backup_media_string, 1582 1582 bkpinfo->media_device); -
trunk/mondo/src/common/libmondo-files.c
r900 r903 1109 1109 log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", nfs_dev); 1110 1110 mr_asprintf(&command, 1111 "ifconfig %s | awk '{print $5}' ", nfs_dev);1111 "ifconfig %s | awk '{print $5}' | head -n1", nfs_dev); 1112 1112 mac_addr = call_program_and_get_last_line_of_output(command); 1113 1113 mr_asprintf(&command, 1114 "ifconfig | grep -E '%s' | head -n1 | cut -d' ' -f1", mac_addr);1114 "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr); 1115 1115 mr_free(nfs_dev); 1116 1116 nfs_dev = call_program_and_get_last_line_of_output(command); -
trunk/mondo/src/mondorestore/mondo-rstr-tools.c
r900 r903 793 793 char *tmp = NULL; 794 794 char *tmp1 = NULL; 795 char *envtmp1 = NULL; 796 char *envtmp2 = NULL; 795 797 char *command = NULL; 796 798 char *iso_mnt = NULL; … … 854 856 /* We need to override prefix value in PXE mode as it's 855 857 * already done in start-nfs */ 858 envtmp1 = getenv("imgname"); 859 if (envtmp1 == NULL) { 860 fatal_error("no imgname variable in environment"); 861 } 856 862 if (strstr(call_program_and_get_last_line_of_output 857 863 ("cat /proc/cmdline"), "pxe")) { 858 strcpy(bkpinfo->prefix,getenv("imgname"));864 mr_allocstr(bkpinfo->prefix,envtmp1); 859 865 } 860 866 … … 985 991 /* We need to override values in PXE mode as it's 986 992 * already done in start-nfs */ 993 envtmp1 = getenv("nfsmount"); 994 if (envtmp1 == NULL) { 995 fatal_error("no nfsmount variable in environment"); 996 } 997 envtmp2 = getenv("dirimg"); 998 if (envtmp2 == NULL) { 999 fatal_error("no dirimg variable in environment"); 1000 } 987 1001 if (strstr(call_program_and_get_last_line_of_output 988 1002 ("cat /proc/cmdline"), "pxe")) { 989 strcpy(bkpinfo->nfs_mount,getenv("nfsmount"));990 strcpy(bkpinfo->nfs_remote_dir,getenv("dirimg"));991 1003 mr_allocstr(bkpinfo->nfs_mount,envtmp1); 1004 mr_allocstr(bkpinfo->nfs_remote_dir,envtmp2); 1005 } 992 1006 } else if (bkpinfo->backup_media_type == iso) { 993 1007 /* Patch by Conor Daly 23-june-2004
Note:
See TracChangeset
for help on using the changeset viewer.