Changeset 43395
- Timestamp:
- 02/02/19 00:10:28 (5 years ago)
- Location:
- titan
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/oealliance/usr/bin/titan.sh
r43393 r43395 297 297 } 298 298 299 startfixautofs300 299 startmnt 301 300 startplugins -
titan/titan/network.h
r43394 r43395 181 181 savesettings = ostrcat(savesettings, "\n", 1, 0); 182 182 } 183 183 /* 184 iface wlan0 inet dhcp 185 pre-up wpa_supplicant -iwlan0 -c/etc/wpa_supplicant.wlan0.conf -B -dd -Dwext || true 186 pre-down wpa_cli -iwlan0 terminate || true 187 */ 188 189 #ifdef OEBUILD 190 if(ostrncmp(net->device, "wlan", 4) == 0) 191 { 192 savesettings = ostrcat(savesettings, "\n\tpre-up wpa_supplicant -i", 1, 0); 193 savesettings = ostrcat(savesettings, net->device, 1, 0); 194 // savesettings = ostrcat(savesettings, " -c/etc/wpa_supplicant.", 1, 0); 195 // savesettings = ostrcat(savesettings, net->device, 1, 0); 196 // savesettings = ostrcat(savesettings, ".conf -B -dd -Dwext || true", 1, 0); 197 savesettings = ostrcat(savesettings, " -c/etc/wpa_supplicant.conf -B -dd -Dwext || true", 1, 0); 198 199 savesettings = ostrcat(savesettings, "\n\tpre-down wpa_cli -i", 1, 0); 200 savesettings = ostrcat(savesettings, net->device, 1, 0); 201 savesettings = ostrcat(savesettings, " terminate || true", 1, 0); 202 } 203 #endif 184 204 int dnscount = 0; 185 205 if(net->type == 0) … … 310 330 if(net->flag == 1) 311 331 { 332 #ifdef OEBUILD 333 cmd = ostrcat(cmd, "/etc/init.d/networking ", 1, 0); 334 #else 312 335 cmd = ostrcat(cmd, "/etc/init.d/networking -i ", 1, 0); 313 336 cmd = ostrcat(cmd, net->device, 1, 0); 337 #endif 314 338 cmd = ostrcat(cmd, " restart", 1, 0); 315 339 tmpstr = ostrcat(tmpstr, command(cmd), 1, 1); … … 322 346 else 323 347 { 348 #ifdef OEBUILD 349 cmd = ostrcat(cmd, "/etc/init.d/networking ", 1, 0); 350 #else 351 cmd = ostrcat(cmd, "/etc/init.d/networking -i ", 1, 0); 352 cmd = ostrcat(cmd, net->device, 1, 0); 353 #endif 354 324 355 cmd = ostrcat(cmd, "/etc/init.d/networking -i ", 1, 0); 325 356 cmd = ostrcat(cmd, net->device, 1, 0); … … 658 689 { 659 690 int ret = 0; 660 691 //#ifdef OEBUILD 661 692 system("killall wpa_supplicant; sleep 2; killall -9 wpa_supplicant"); 662 693 ret = system("wlan.sh"); 694 //#endif 695 663 696 addinetworkall(NULL); 664 697
Note: See TracChangeset
for help on using the changeset viewer.