Changeset 197 in MondoRescue for trunk/mondo/mondo/common
- Timestamp:
- Dec 14, 2005, 12:12:15 AM (18 years ago)
- Location:
- trunk/mondo/mondo/common
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/mondo/common/libmondo-devices.c
r171 r197 2264 2264 assert(which_device != NULL); 2265 2265 asprintf(&list_drives_cmd, 2266 // "parted2fdisk 2267 "fdisk -l 2>/dev/null | grep \"/dev/.*:\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/; echo %s", 2266 "parted2fdisk -l 2>/dev/null | grep \"/dev/.*:\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/; echo %s", 2268 2267 where_is_root_mounted()); 2269 2268 log_it("list_drives_cmd = %s", list_drives_cmd); … … 2419 2418 2420 2419 log_msg(0, "Looking for partition table format type"); 2421 // BERLIOS: Do that temporarily: we need to put back parted2fdisk everywhere 2422 #ifdef __IA64__ 2423 struct stat buf; 2424 2425 asprintf(&fdisk, "/usr/local/bin/fdisk"); 2426 if (stat(fdisk, &buf) != 0) { 2427 paranoid_free(fdisk); 2428 #endif 2429 asprintf(&fdisk, "/sbin/fdisk"); 2430 #ifdef __IA64__ 2431 } 2432 #endif 2420 asprintf(&fdisk, "/sbin/parted2fdisk"); 2433 2421 log_msg(1, "Using %s", fdisk); 2434 2422 asprintf(&command, "%s -l %s | grep 'EFI GPT'", fdisk, drive); -
trunk/mondo/mondo/common/libmondo-files.c
r194 r197 1038 1038 char *nfs_client_ipaddr; 1039 1039 char *nfs_client_netmask; 1040 char *nfs_client_broadcast;; 1040 1041 char *nfs_client_defgw; 1041 1042 char *nfs_server_ipaddr; … … 1079 1080 1080 1081 asprintf(&command, 1082 "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f8 | cut -d':' -f2"); 1083 strcpy(nfs_client_broadcast, 1084 call_program_and_get_last_line_of_output(command)); 1085 sprintf(command, 1081 1086 "route -n | grep '^0.0.0.0' | awk '{printf $2}'"); 1082 1087 asprintf(&nfs_client_defgw, … … 1104 1109 } 1105 1110 fprintf(fout, "ifconfig lo 127.0.0.1 # config loopback\n"); 1106 fprintf(fout, "ifconfig %s %s netmask %s # config client\n", nfs_dev,1107 nfs_client_ipaddr, nfs_client_netmask );1111 fprintf(fout, "ifconfig %s %s netmask %s broadcast %s # config client\n", nfs_dev, 1112 nfs_client_ipaddr, nfs_client_netmask, nfs_client_broadcast); 1108 1113 fprintf(fout, "route add default gw %s # default route\n", nfs_client_defgw); 1109 1114 fprintf(fout, "ping -c 1 %s # ping server\n", nfs_server_ipaddr); … … 1141 1146 write_one_liner_data_file(tmp, nfs_client_defgw); 1142 1147 paranoid_free(nfs_client_defgw); 1148 paranoid_free(tmp); 1149 1150 asprintf(&tmp, "%s/NFS-CLIENT-BROADCAST", bkpinfo->tmpdir); 1151 write_one_liner_data_file(tmp, nfs_client_broadcast); 1152 paranoid_free(nfs_client_broadcast); 1143 1153 paranoid_free(tmp); 1144 1154 -
trunk/mondo/mondo/common/libmondo-tools.c
r183 r197 993 993 } 994 994 995 if (!run_program_and_log_output(" fdisk -l | grep -i raid", 1)995 if (!run_program_and_log_output("parted2fdisk -l | grep -i raid", 1) 996 996 && !does_file_exist("/etc/raidtab")) { 997 997 log_to_screen
Note:
See TracChangeset
for help on using the changeset viewer.