Changeset 870 in MondoRescue for branches/stable
- Timestamp:
- Oct 3, 2006, 4:12:38 PM (18 years ago)
- Location:
- branches/stable
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mindi/rootfs/sbin/init
r866 r870 458 458 ExtractDataDisksAndLoadModules 459 459 elif [ "`grep -i pxe /proc/cmdline`" ]; then 460 /sbin/start-nfs 460 # We need to get here exported variables from start-nfs 461 . /sbin/start-nfs 461 462 462 463 # Simulate a local CD … … 467 468 HandleCDROMorFloppies 468 469 ExtractDataDisksAndLoadModules 469 /sbin/start-nfs 470 # We need to get here exported variables from start-nfs 471 . /sbin/start-nfs 470 472 fi 471 473 res=$? -
branches/stable/mondo/mondo/mondorestore/mondo-rstr-tools.c
r801 r870 973 973 { 974 974 /** add mallocs **/ 975 char *value; 976 char *tmp; 977 char *command; 978 char *iso_mnt; 979 char *iso_path; 980 char *old_isodir; 975 char *value = NULL; 976 char *tmp = NULL; 977 char *tmp1 = NULL; 978 char *command = NULL; 979 char *iso_mnt = NULL; 980 char *iso_path = NULL; 981 char *old_isodir = NULL; 981 982 char cfg_file[100]; 982 983 t_bkptype media_specified_by_user; … … 1046 1047 /* We need to override prefix value in PXE mode as it's 1047 1048 * already done in start-nfs */ 1049 if (tmp = getenv("imgname") == NULL) { 1050 fatal_error("no imgname variable in environment"); 1051 } 1048 1052 if (strstr(call_program_and_get_last_line_of_output 1049 1053 ("cat /proc/cmdline"), "pxe")) { 1050 strcpy(bkpinfo->prefix, getenv("imgname"));1054 strcpy(bkpinfo->prefix,tmp); 1051 1055 } 1052 1056 … … 1160 1164 /* We need to override values in PXE mode as it's 1161 1165 * already done in start-nfs */ 1166 if (tmp = getenv("nfsmount") == NULL) { 1167 fatal_error("no nfsmount variable in environment"); 1168 } 1169 if (tmp1 = getenv("dirimg") == NULL) { 1170 fatal_error("no dirimg variable in environment"); 1171 } 1162 1172 if (strstr(call_program_and_get_last_line_of_output 1163 1173 ("cat /proc/cmdline"), "pxe")) { 1164 strcpy(bkpinfo->nfs_mount, getenv("nfsmount"));1165 strcpy(bkpinfo->nfs_remote_dir, getenv("dirimg"));1174 strcpy(bkpinfo->nfs_mount,tmp); 1175 strcpy(bkpinfo->nfs_remote_dir,tmp1); 1166 1176 } 1167 1177 } else if (bkpinfo->backup_media_type == iso) {
Note:
See TracChangeset
for help on using the changeset viewer.