diff options
| author | makefu <makefu@syntax-fehler.de> | 2011-07-11 14:47:11 +0200 |
|---|---|---|
| committer | makefu <makefu@syntax-fehler.de> | 2011-07-11 14:47:11 +0200 |
| commit | 7c485dd884fe812d114df55e62071c125b6d6cd6 (patch) | |
| tree | e25203d8a68c30b6b97f420230b18b98fa4e601c /mining/user | |
| parent | bc79f905a3437b767dffcc83ea570efea4e5c10c (diff) | |
| parent | b95bc0963f5be17a45600ac4750a721b1ed30e4d (diff) | |
Merge of github.com:krebscode/painload newline
Conflicts:
temper/Makefile: stupid newline
Diffstat (limited to 'mining/user')
| -rwxr-xr-x | mining/user/bin/ati_temper | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | mining/user/startup.sh | 15 |
2 files changed, 6 insertions, 14 deletions
diff --git a/mining/user/bin/ati_temper b/mining/user/bin/ati_temper deleted file mode 100755 index 283a6024..00000000 --- a/mining/user/bin/ati_temper +++ /dev/null @@ -1,5 +0,0 @@ -#displays: CARD1TEMP CARD2TEMP CPUTEMP OUTSIDE -echo -n "`DISPLAY=:0 aticonfig --adapter=1 --od-gettemperature | grep Temperature | sed -n 's/.*Temperature - \([0-9.]*\) C/\1/;p'` " -echo -n "`DISPLAY=:0 aticonfig --adapter=2 --od-gettemperature | grep Temperature | sed -n 's/.*Temperature - \([0-9.]*\) C/\1/;p'` " -echo -n "`sensors | grep temp1 | sed -e 's/temp1: *+\([0-9.]*\).*/\1/'` " -echo "`temper`" diff --git a/mining/user/startup.sh b/mining/user/startup.sh index eb2ce13a..6274a892 100644..100755 --- a/mining/user/startup.sh +++ b/mining/user/startup.sh @@ -1,16 +1,13 @@ -sudo pkill xscreensaver sudo pkill tmux -sleep 1 +sleep 5 +source ~/.profile export DISPLAY=:0 - export URL="${URL-http://txgen_chinaman:lolwut@uk.btcguild.com:8332}" #export URL="http://txgen:qJrXefWX@bitcoinpool.com:8334" -slock & tmux start-server tmux new-session -d -s mining -n mining -printenv > /home/user/environment -tmux new-window -t mining:1 'AMDOverdriveCtrl -i 0 mining.ovdr' -tmux new-window -t mining:2 'AMDOverdriveCtrl -i 3 mining.ovdr' +tmux new-window -t mining:1 'cd ~;AMDOverdriveCtrl -i 0 mining.ovdr' +tmux new-window -t mining:2 'cd ~;AMDOverdriveCtrl -i 3 mining.ovdr' sleep 5 -tmux new-window -t mining:3 "cd /opt/miners/phoenix; while sleep 1; do sudo python phoenix.py -u $URL -k phatk DEVICE=0 VECTORS BFI_INT WORKSIZE=256 AGGRESSION=12 FASTLOOPS=false;done" -tmux new-window -t mining:4 "cd /opt/miners/phoenix; while sleep 1;do sudo python phoenix.py -u $URL -k phatk DEVICE=1 VECTORS BFI_INT WORKSIZE=256 AGGRESSION=10 FASTLOOPS=false ; done" +tmux new-window -t mining:3 "cd /usr/src/phoenix-miner/; while sleep 1; do sudo ./phoenix.py -u $URL -k phatk DEVICE=0 VECTORS BFI_INT WORKSIZE=256 AGGRESSION=12 FASTLOOPS=false;done" +tmux new-window -t mining:4 "cd /usr/src/phoenix-miner/; while sleep 1; do sudo ./phoenix.py -u $URL -k phatk DEVICE=1 VECTORS BFI_INT WORKSIZE=256 AGGRESSION=12 FASTLOOPS=false;done" |