diff options
| author | Chinaman <root@chinaman> | 2011-07-10 06:27:00 +0200 |
|---|---|---|
| committer | Chinaman <root@chinaman> | 2011-07-10 06:27:00 +0200 |
| commit | 3fab586c47ec1bb919048a43949f7cca00b1adc2 (patch) | |
| tree | 721a74235a5f3df484a84194ee584613c25d5d89 | |
| parent | aa57527badc83b49a73ac7708976d88079ea8c23 (diff) | |
| parent | 8d5eeef8b3b1d1b78bf2e2cdaece50190a999b9a (diff) | |
Merge branch 'master' of github.com:krebscode/painload
| -rw-r--r-- | mining/Makefile | 2 | ||||
| -rwxr-xr-x | mining/bin/ensure-wlan0 | 32 |
2 files changed, 21 insertions, 13 deletions
diff --git a/mining/Makefile b/mining/Makefile index f8362cda..8701920f 100644 --- a/mining/Makefile +++ b/mining/Makefile @@ -14,7 +14,7 @@ fix-linucCoin: configure echo 'sudo tar xvf /opt/AMD-APP-SDK-v2.4-lnx64/icd-registration.tgz -C /' >> /usr/bin/ati_license cp -r user /home configure: - sensors-detect + yes '' | sensors-detect @cat CONFIGURE archlinux: bin/archlinux-cruise-control diff --git a/mining/bin/ensure-wlan0 b/mining/bin/ensure-wlan0 index 92839a13..77587156 100755 --- a/mining/bin/ensure-wlan0 +++ b/mining/bin/ensure-wlan0 @@ -6,20 +6,28 @@ if test "${nosudo-false}" != true -a `id -u` != 0; then exit 23 # go to hell fi -if ! ifconfig wlan0 | grep -q 'inet addr'; then - if ! grep -q wlan0 /etc/network/interfaces; then - cat >> /etc/network/interfaces <<EOF -# generated by rc.local -auto wlan0 -iface wlan0 inet dhcp -wpa_conf /etc/wpa_supplicant/wpa_supplicant.conf -EOF +has_internet() { + curl -sS google.com >/dev/null +} + +if ! has_internet; then + + ## get rid of the nightmare applet + pkill -9 nm-applet + if test -x "`type -p nm-applet`"; then + rm -vf "`type -p nm-applet`" fi - beep -l 50 -f 2000; /etc/init.d/network-manager restart - beep -l 50 -f 2000; ifdown wlan0 - beep -l 50 -f 2000; ifup wlan0 - if ifconfig wlan0 | grep -q 'inet addr'; then + beep -l 50 -f 2000; pkill wpa_supplicant + beep -l 50 -f 2000; wpa_supplicant -i wlan0 -c /etc/wpa_supplicant/wpa_supplicant.conf & + while ! wpa_cli status | grep -q wpa_state=COMPLETED; do + beep -l 50 -f 2000 -D 50 -n -l 50 -f 2000 + sleep 1 + done + beep -l 50 -f 2000; dhcpcd -x wlan0 + beep -l 50 -f 2000; dhcpcd wlan0 + #echo nameserver 8.8.8.8 >/etc/resolv.conf + if has_internet; then beep -l 50 -f 2000 -n -l 100 -f 3000 else beep -l 50 -f 2000 -n -l 100 -f 1000 |