Changeset 618 in MondoRescue for trunk/mondo
- Timestamp:
- Jun 3, 2006, 12:16:18 AM (18 years ago)
- Location:
- trunk/mondo
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/ChangeLog
r588 r618 3 3 MONDO CHANGES 4 4 5 v2.2.0 (2006-0 5-01)5 v2.2.0 (2006-06-02) 6 6 - indent on source files 7 7 - asprintf used instead of malloc_string + sprintf/strcpy/strcat without … … 11 11 <rmd_at_mecreant.org> who achieved that big task) 12 12 13 2.0.8 (2006-05-25) 13 2.0.8-2 (2006-06-02) 14 - PXE mode now supports change of NIC for redeployment 15 (Bruno Cornec) 16 17 2.0.8-1 (2006-05-25) 14 18 - new build process (Bruno Cornec) 15 19 - Fix a bug in .spec for RPM build (%attr now unused) -
trunk/mondo/mondo/common/libmondo-files.c
r507 r618 1149 1149 fprintf(fout, "done\n"); 1150 1150 fprintf(fout, "ifconfig lo 127.0.0.1 # config loopback\n"); 1151 fprintf(fout, "ipdev=%s\n", nfs_dev); 1151 1152 fprintf(fout, "ipaddress=%s\n", nfs_client_ipaddr); 1152 1153 fprintf(fout, "ipnetmask=%s\n", nfs_client_netmask); … … 1157 1158 fprintf(fout, " echo $i | grep -qi ipconf= && ipconf=`echo $i | cut -d= -f2`\n"); 1158 1159 fprintf(fout, "done\n"); 1159 fprintf(fout, "if [ \"$ipconf\" = \"dhcp\" ]; then\n"); 1160 fprintf(fout, " udhcpc -i %s\n", nfs_dev); 1160 fprintf(fout, "grep -q \"dhcp\" \"$ipconf\"\n"); 1161 fprintf(fout, "if [ $? = 0 ]; then\n"); 1162 fprintf(fout, " ipdev=`echo $ipconf | cut -d: -f1`\n"); 1163 fprintf(fout, " udhcpc -i $ipdev\n", ); 1161 1164 fprintf(fout, "else\n"); 1162 1165 fprintf(fout, " if [ \"$ipconf\" != \"\" ]; then\n"); 1163 fprintf(fout, " ipaddress=`echo $ipconf | cut -d: -f1`\n"); 1164 fprintf(fout, " ipnetmask=`echo $ipconf | cut -d: -f2`\n"); 1165 fprintf(fout, " ipbroadcast=`echo $ipconf | cut -d: -f3`\n"); 1166 fprintf(fout, " ipgateway=`echo $ipconf | cut -d: -f4`\n"); 1166 fprintf(fout, " ipdev=`echo $ipconf | cut -d: -f1`\n"); 1167 fprintf(fout, " ipaddress=`echo $ipconf | cut -d: -f2`\n"); 1168 fprintf(fout, " ipnetmask=`echo $ipconf | cut -d: -f3`\n"); 1169 fprintf(fout, " ipbroadcast=`echo $ipconf | cut -d: -f4`\n"); 1170 fprintf(fout, " ipgateway=`echo $ipconf | cut -d: -f5`\n"); 1167 1171 fprintf(fout, " fi\n"); 1168 fprintf(fout, " ifconfig %s $ipaddress netmask $ipnetmask broadcast $ipbroadcast\n", nfs_dev);1172 fprintf(fout, " ifconfig $ipdev $ipaddress netmask $ipnetmask broadcast $ipbroadcast\n"); 1169 1173 fprintf(fout, " route add default gw $ipgateway\n"); 1170 1174 fprintf(fout, "fi\n"); -
trunk/mondo/mondo/mondoarchive/mondo-cli.c
r524 r618 219 219 char *tmp1; 220 220 char *psz; 221 char *p; 222 char *q; 221 223 222 224 long itbs; … … 302 304 } 303 305 asprintf(&tmp1, flag_val['I']); 304 char *p = tmp1;305 char *q = tmp1;306 p = tmp1; 307 q = tmp1; 306 308 307 309 /* Cut the flag_val['I'] in parts containing all paths to test them */ … … 538 540 } 539 541 asprintf(&tmp1, flag_val['E']); 540 char *p = tmp1;541 char *q = tmp1;542 p = tmp1; 543 q = tmp1; 542 544 543 545 /* Cut the flag_val['E'] in parts containing all paths to test them */ -
trunk/mondo/mondo/mondorestore/mondo-restore.c
r561 r618 3160 3160 "to the Mondo mailing list when you are seeking technical "); 3161 3161 log_msg(0, 3162 "support. Without it, we can't help you. - Hugo");3162 "support. Without it, we can't help you. - DevTeam"); 3163 3163 log_msg(0, 3164 3164 "------------------------------------------------------------");
Note:
See TracChangeset
for help on using the changeset viewer.