From c163035fa430a0f2322219eb7aa6fa0b86992c4f Mon Sep 17 00:00:00 2001 From: user Date: Sun, 3 Jul 2011 06:37:25 +0000 Subject: add mining/user/bin/ensure-wlan0 usage: combine this with cron to ensure wlan0 --- btc/mining/user/bin/ensure-wlan0 | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100755 btc/mining/user/bin/ensure-wlan0 diff --git a/btc/mining/user/bin/ensure-wlan0 b/btc/mining/user/bin/ensure-wlan0 new file mode 100755 index 00000000..92839a13 --- /dev/null +++ b/btc/mining/user/bin/ensure-wlan0 @@ -0,0 +1,32 @@ +#! /bin/sh + +if test "${nosudo-false}" != true -a `id -u` != 0; then + echo "we're going sudo..." >&2 + exec sudo "$0" "$@" + 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 < Date: Sun, 3 Jul 2011 06:43:01 +0000 Subject: add mining/user/bin/cleanup_tmp usage: combine this with cron to clean miner's .so-files from /tmp this was required @bergwerk to prevent filling up the tmpfs what stopped the miner... --- btc/mining/user/bin/cleanup_tmp | 4 ++++ 1 file changed, 4 insertions(+) create mode 100755 btc/mining/user/bin/cleanup_tmp diff --git a/btc/mining/user/bin/cleanup_tmp b/btc/mining/user/bin/cleanup_tmp new file mode 100755 index 00000000..e1395b19 --- /dev/null +++ b/btc/mining/user/bin/cleanup_tmp @@ -0,0 +1,4 @@ +#! /bin/sh +ls -lAtr /tmp/ | sed -rn ' + /\.so$/{$!{s/.* ([A-Za-z0-9]+\.so)$/rm -v \/tmp\/\1/p}} +' | sudo sh -- cgit v1.2.3 From 7deefeb09ce2f188bff67f432078caa255543ff5 Mon Sep 17 00:00:00 2001 From: user Date: Fri, 8 Jul 2011 05:41:00 +0000 Subject: add mining/user/bin/ensure-router --- btc/mining/user/bin/ensure-router | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100755 btc/mining/user/bin/ensure-router diff --git a/btc/mining/user/bin/ensure-router b/btc/mining/user/bin/ensure-router new file mode 100755 index 00000000..987ed5b1 --- /dev/null +++ b/btc/mining/user/bin/ensure-router @@ -0,0 +1,25 @@ +#! /bin/sh + +if test "${nosudo-false}" != true -a `id -u` != 0; then + echo "we're going sudo..." >&2 + exec sudo "$0" "$@" + exit 23 # go to hell +fi + +if=eth2 + +if ! ifconfig $if | grep -q 'inet addr'; then + beep -l 50 -f 2500; ifconfig $if 0.0.0.0 down || : + beep -l 50 -f 2500; ifconfig $if 23.0.0.1/8 up || : + beep -l 50 -f 2500; /etc/init.d/dnsmasq restart + if ifconfig $if | grep -q 'inet addr'; then + beep -l 50 -f 2500 -n -l 100 -f 3000 + else + beep -l 50 -f 2500 -n -l 100 -f 1000 + fi +else + case "${1-}" in + (--quiet) : ;; + (*) beep -l 50 -f 2500 -n -l 100 -f 2500 ;; + esac +fi -- cgit v1.2.3 From efc72df0e8a8115741e60bffed6e5854a43b5b38 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 8 Jul 2011 06:34:05 +0000 Subject: masquerade wlan0, eth2 --- btc/mining/user/bin/ensure-router | 2 ++ 1 file changed, 2 insertions(+) diff --git a/btc/mining/user/bin/ensure-router b/btc/mining/user/bin/ensure-router index 987ed5b1..ec78f610 100755 --- a/btc/mining/user/bin/ensure-router +++ b/btc/mining/user/bin/ensure-router @@ -12,6 +12,8 @@ if ! ifconfig $if | grep -q 'inet addr'; then beep -l 50 -f 2500; ifconfig $if 0.0.0.0 down || : beep -l 50 -f 2500; ifconfig $if 23.0.0.1/8 up || : beep -l 50 -f 2500; /etc/init.d/dnsmasq restart + beep -l 50 -f 2500; iptables -t nat -A POSTROUTING -o wlan0 -j MASQUERADE + beep -l 50 -f 2500; iptables -t nat -A POSTROUTING -o eth2 -j MASQUERADE if ifconfig $if | grep -q 'inet addr'; then beep -l 50 -f 2500 -n -l 100 -f 3000 else -- cgit v1.2.3 From 2f791c20ae45e7030c1b27d65f69186309a8ef8c Mon Sep 17 00:00:00 2001 From: root Date: Fri, 8 Jul 2011 17:24:48 +0200 Subject: mining: added archlinux cruise control mining/Makefile: added archlinux cruise control (auto installer) which always does the right thing. loosely after http://rubyists.github.com/2011/06/08/how-to-build-a-namecoin-or-bitcoin-miner-in98-easy-steps.html mining/{user/,}/bin:renamed mining/bin/newkey.sh: add policy Xorg keygen --- btc/mining/Makefile | 40 ++++++++++++++++++++++++++++++++++++++- btc/mining/bin/ati_temper | 5 +++++ btc/mining/bin/cleanup_tmp | 4 ++++ btc/mining/bin/ensure-router | 27 ++++++++++++++++++++++++++ btc/mining/bin/ensure-wlan0 | 32 +++++++++++++++++++++++++++++++ btc/mining/bin/newkey.sh | 15 +++++++++++++++ btc/mining/user/bin/ati_temper | 5 ----- btc/mining/user/bin/cleanup_tmp | 4 ---- btc/mining/user/bin/ensure-router | 27 -------------------------- btc/mining/user/bin/ensure-wlan0 | 32 ------------------------------- 10 files changed, 122 insertions(+), 69 deletions(-) create mode 100755 btc/mining/bin/ati_temper create mode 100755 btc/mining/bin/cleanup_tmp create mode 100755 btc/mining/bin/ensure-router create mode 100755 btc/mining/bin/ensure-wlan0 create mode 100755 btc/mining/bin/newkey.sh delete mode 100755 btc/mining/user/bin/ati_temper delete mode 100755 btc/mining/user/bin/cleanup_tmp delete mode 100755 btc/mining/user/bin/ensure-router delete mode 100755 btc/mining/user/bin/ensure-wlan0 diff --git a/btc/mining/Makefile b/btc/mining/Makefile index b867d469..21db5091 100644 --- a/btc/mining/Makefile +++ b/btc/mining/Makefile @@ -5,7 +5,7 @@ select-target: @cat Makefile format: cat README -install: configure +fix-linucCoin: configure apt-get install --yes lm-sensors tmux echo '#!/bin/bash' > /usr/bin/ati_license echo '#!/bin/sh' > /etc/init.d/live-boot @@ -16,3 +16,41 @@ install: configure configure: sensors-detect @cat CONFIGURE +archlinux: + @echo "!! ARCHLINUX Cruise Control Mining installer !!" + @echo "** adding main network profile" + cp /etc/network.d/examples/ethernet-dhcp /etc/network.d/main + echo 'POST_UP="sed -i \"1i nameserver 8.8.8.8\" /etc/resolv.conf"' >> /etc/network.d/main + @echo "** adding worker account" + grep -q worker /etc/passwd || adduser worker + @echo "** adding archlinuxfr to pacman.conf" + grep -q archlinuxfr /etc/pacman.conf || echo "[archlinuxfr]" >> /etc/pacman.conf && echo "Server = http://repo.archlinux.fr/x86_64" >> /etc/pacman.conf + + pacman --needed --noconfirm -Syu rsync git openssh yajl sudo tmux lm_sensors vim yaourt kernel26-headers + @echo "** installing tinc" + yaourt -S tinc + sed -i -e 's/.*\%wheel.*/%wheel ALL=(ALL) NOPASSWD: ALL/1' /etc/sudoers + @echo "** Installing ATI drivers" + [ "`yaourt -Q catalyst-utils`" ] || yaourt -S --noconfirm catalyst-utils + [ "`yaourt -Q catalyst-hook`" ] || yaourt -S --noconfirm catalyst-hook + [ "`yaourt -Q amdstream`" ] || yaourt -S --noconfirm amdstream + @echo "** installing X" + pacman --needed -S --noconfirm -f xorg-server xorg-apps xorg-appres xorg-xinit xautolock xlockmore xorg-fonts xorg-xhost xorg-xauth xterm rxvt-unicode xorg-twm + @echo "** copying bin folder" + cp -r bin /home/worker + @echo "** creating new .Xauthority for worker" + sudo -u worker /home/worker/bin/newkey.sh + @echo "configuring X" + @echo "!! ACTION REQUIRED, write down the first number of your ATI Graphics Adapter." + @echo "!! i will open /etc/X11/xorg.conf for you, change the BusID of every Device to the numbers you see here" + @echo "!!press enter to continue" + lspci|grep VGA + read + aticonfig --initial=dual-head + vim /etc/X11/xorg.conf + @echo "** creating xinitrc and start x" + echo 'setxkbmap -option terminate:ctrl_alt_bksp' > /home/worker/.xinitrc + echo 'xautolock -corners +-+- -locker "xlock -mode blank"&' >> /home/worker/.xinitrc + echo 'xterm &' >> /home/worker/.xinitrc + echo 'exec awesome' >> /home/worker/.xinitrc + @echo '!! start x with `xinit -- -auth ~/.Xauthority`' diff --git a/btc/mining/bin/ati_temper b/btc/mining/bin/ati_temper new file mode 100755 index 00000000..283a6024 --- /dev/null +++ b/btc/mining/bin/ati_temper @@ -0,0 +1,5 @@ +#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/btc/mining/bin/cleanup_tmp b/btc/mining/bin/cleanup_tmp new file mode 100755 index 00000000..e1395b19 --- /dev/null +++ b/btc/mining/bin/cleanup_tmp @@ -0,0 +1,4 @@ +#! /bin/sh +ls -lAtr /tmp/ | sed -rn ' + /\.so$/{$!{s/.* ([A-Za-z0-9]+\.so)$/rm -v \/tmp\/\1/p}} +' | sudo sh diff --git a/btc/mining/bin/ensure-router b/btc/mining/bin/ensure-router new file mode 100755 index 00000000..ec78f610 --- /dev/null +++ b/btc/mining/bin/ensure-router @@ -0,0 +1,27 @@ +#! /bin/sh + +if test "${nosudo-false}" != true -a `id -u` != 0; then + echo "we're going sudo..." >&2 + exec sudo "$0" "$@" + exit 23 # go to hell +fi + +if=eth2 + +if ! ifconfig $if | grep -q 'inet addr'; then + beep -l 50 -f 2500; ifconfig $if 0.0.0.0 down || : + beep -l 50 -f 2500; ifconfig $if 23.0.0.1/8 up || : + beep -l 50 -f 2500; /etc/init.d/dnsmasq restart + beep -l 50 -f 2500; iptables -t nat -A POSTROUTING -o wlan0 -j MASQUERADE + beep -l 50 -f 2500; iptables -t nat -A POSTROUTING -o eth2 -j MASQUERADE + if ifconfig $if | grep -q 'inet addr'; then + beep -l 50 -f 2500 -n -l 100 -f 3000 + else + beep -l 50 -f 2500 -n -l 100 -f 1000 + fi +else + case "${1-}" in + (--quiet) : ;; + (*) beep -l 50 -f 2500 -n -l 100 -f 2500 ;; + esac +fi diff --git a/btc/mining/bin/ensure-wlan0 b/btc/mining/bin/ensure-wlan0 new file mode 100755 index 00000000..92839a13 --- /dev/null +++ b/btc/mining/bin/ensure-wlan0 @@ -0,0 +1,32 @@ +#! /bin/sh + +if test "${nosudo-false}" != true -a `id -u` != 0; then + echo "we're going sudo..." >&2 + exec sudo "$0" "$@" + 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 <&2 - exec sudo "$0" "$@" - exit 23 # go to hell -fi - -if=eth2 - -if ! ifconfig $if | grep -q 'inet addr'; then - beep -l 50 -f 2500; ifconfig $if 0.0.0.0 down || : - beep -l 50 -f 2500; ifconfig $if 23.0.0.1/8 up || : - beep -l 50 -f 2500; /etc/init.d/dnsmasq restart - beep -l 50 -f 2500; iptables -t nat -A POSTROUTING -o wlan0 -j MASQUERADE - beep -l 50 -f 2500; iptables -t nat -A POSTROUTING -o eth2 -j MASQUERADE - if ifconfig $if | grep -q 'inet addr'; then - beep -l 50 -f 2500 -n -l 100 -f 3000 - else - beep -l 50 -f 2500 -n -l 100 -f 1000 - fi -else - case "${1-}" in - (--quiet) : ;; - (*) beep -l 50 -f 2500 -n -l 100 -f 2500 ;; - esac -fi diff --git a/btc/mining/user/bin/ensure-wlan0 b/btc/mining/user/bin/ensure-wlan0 deleted file mode 100755 index 92839a13..00000000 --- a/btc/mining/user/bin/ensure-wlan0 +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh - -if test "${nosudo-false}" != true -a `id -u` != 0; then - echo "we're going sudo..." >&2 - exec sudo "$0" "$@" - 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 < Date: Fri, 8 Jul 2011 18:02:29 +0200 Subject: mining/bin/archlinux-cruise-control added script is pulled out from the original Makefile. added TODO file(because every project needs one --- btc/mining/Makefile | 38 +--------------------------- btc/mining/TODO | 2 ++ btc/mining/bin/archlinux-cruise-control | 44 +++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 37 deletions(-) create mode 100644 btc/mining/TODO create mode 100755 btc/mining/bin/archlinux-cruise-control diff --git a/btc/mining/Makefile b/btc/mining/Makefile index 21db5091..f8362cda 100644 --- a/btc/mining/Makefile +++ b/btc/mining/Makefile @@ -17,40 +17,4 @@ configure: sensors-detect @cat CONFIGURE archlinux: - @echo "!! ARCHLINUX Cruise Control Mining installer !!" - @echo "** adding main network profile" - cp /etc/network.d/examples/ethernet-dhcp /etc/network.d/main - echo 'POST_UP="sed -i \"1i nameserver 8.8.8.8\" /etc/resolv.conf"' >> /etc/network.d/main - @echo "** adding worker account" - grep -q worker /etc/passwd || adduser worker - @echo "** adding archlinuxfr to pacman.conf" - grep -q archlinuxfr /etc/pacman.conf || echo "[archlinuxfr]" >> /etc/pacman.conf && echo "Server = http://repo.archlinux.fr/x86_64" >> /etc/pacman.conf - - pacman --needed --noconfirm -Syu rsync git openssh yajl sudo tmux lm_sensors vim yaourt kernel26-headers - @echo "** installing tinc" - yaourt -S tinc - sed -i -e 's/.*\%wheel.*/%wheel ALL=(ALL) NOPASSWD: ALL/1' /etc/sudoers - @echo "** Installing ATI drivers" - [ "`yaourt -Q catalyst-utils`" ] || yaourt -S --noconfirm catalyst-utils - [ "`yaourt -Q catalyst-hook`" ] || yaourt -S --noconfirm catalyst-hook - [ "`yaourt -Q amdstream`" ] || yaourt -S --noconfirm amdstream - @echo "** installing X" - pacman --needed -S --noconfirm -f xorg-server xorg-apps xorg-appres xorg-xinit xautolock xlockmore xorg-fonts xorg-xhost xorg-xauth xterm rxvt-unicode xorg-twm - @echo "** copying bin folder" - cp -r bin /home/worker - @echo "** creating new .Xauthority for worker" - sudo -u worker /home/worker/bin/newkey.sh - @echo "configuring X" - @echo "!! ACTION REQUIRED, write down the first number of your ATI Graphics Adapter." - @echo "!! i will open /etc/X11/xorg.conf for you, change the BusID of every Device to the numbers you see here" - @echo "!!press enter to continue" - lspci|grep VGA - read - aticonfig --initial=dual-head - vim /etc/X11/xorg.conf - @echo "** creating xinitrc and start x" - echo 'setxkbmap -option terminate:ctrl_alt_bksp' > /home/worker/.xinitrc - echo 'xautolock -corners +-+- -locker "xlock -mode blank"&' >> /home/worker/.xinitrc - echo 'xterm &' >> /home/worker/.xinitrc - echo 'exec awesome' >> /home/worker/.xinitrc - @echo '!! start x with `xinit -- -auth ~/.Xauthority`' + bin/archlinux-cruise-control diff --git a/btc/mining/TODO b/btc/mining/TODO new file mode 100644 index 00000000..bafaa72a --- /dev/null +++ b/btc/mining/TODO @@ -0,0 +1,2 @@ +- fix the sed script in "make archlinux" to replace only the first occurrence +- test the amdoverdrive stuff from the home dir (user) diff --git a/btc/mining/bin/archlinux-cruise-control b/btc/mining/bin/archlinux-cruise-control new file mode 100755 index 00000000..d455d10e --- /dev/null +++ b/btc/mining/bin/archlinux-cruise-control @@ -0,0 +1,44 @@ +#!/bin/bash +set -euf +export EDITOR=vim +echo "!! ARCHLINUX Cruise Control Mining installer !!" +echo "** adding main network profile" +cp /etc/network.d/examples/ethernet-dhcp /etc/network.d/main +echo 'POST_UP="sed -i \"1i nameserver 8.8.8.8\" /etc/resolv.conf"' >> /etc/network.d/main +echo "** adding worker account" +grep -q worker /etc/passwd || adduser worker +echo "** adding archlinuxfr to pacman.conf" +grep -q archlinuxfr /etc/pacman.conf || echo "[archlinuxfr]" >> /etc/pacman.conf && echo "Server = http://repo.archlinux.fr/x86_64" >> /etc/pacman.conf +pacman --needed --noconfirm -Syu rsync git openssh yajl sudo tmux lm_sensors vim yaourt kernel26-headers +echo "** installing tinc" +[ "`yaourt -Q tinc`" ] || yaourt -S --noconfirm tinc +sed -i -e 's/.*\%wheel.*/%wheel ALL=(ALL) NOPASSWD: ALL/1' /etc/sudoers +echo "** Installing ATI drivers" +[ "`yaourt -Q catalyst-utils`" ] || yaourt -S --noconfirm catalyst-utils +[ "`yaourt -Q catalyst-hook`" ] || yaourt -S --noconfirm catalyst-hook +[ "`yaourt -Q amdstream`" ] || yaourt -S --noconfirm amdstream +echo "** installing X" +pacman --needed -S --noconfirm xorg-server xorg-apps xorg-appres xorg-xinit xautolock xlockmore xorg-fonts xorg-xhost xorg-xauth xterm rxvt-unicode xorg-twm +echo "** Installing mining tools and overclocking stuff" +[ "`yaourt -Q phoenix-miner-svn`" ] || yaourt -S --noconfirm phoenix-miner-svn +echo "!! warning, you might need to adjust the version number of AMDOverdriveCTRL !!" +[ "`yaourt -Q amdoverdrivectrl`" ] || yaourt -S amdoverdrivectrl +echo "** copying bin folder" +cp -r $(readlink -f `dirname $0`)/ /home/worker +echo "** creating new .Xauthority for worker" +sudo -u worker /home/worker/bin/newkey.sh +echo "configuring X" +echo "!! ACTION REQUIRED, write down the first number of your ATI Graphics Adapter." +echo "!! i will open /etc/X11/xorg.conf for you, change the BusID of every Device to the numbers you see here" +echo "!! press enter to continue" +lspci|grep VGA +read +aticonfig --initial=dual-head +vim /etc/X11/xorg.conf +echo "** creating xinitrc and start x" +echo 'setxkbmap -option terminate:ctrl_alt_bksp' > /home/worker/.xinitrc +echo 'xautolock -corners +-+- -locker "xlock -mode blank"&' >> /home/worker/.xinitrc +echo 'xterm &' >> /home/worker/.xinitrc +echo 'exec twm' >> /home/worker/.xinitrc +echo '!! start x with `xinit -- -auth ~/.Xauthority`' + -- cgit v1.2.3 From 4a76c725b2ecc30f9ccd4ad8f5ede04c0a2d02cd Mon Sep 17 00:00:00 2001 From: user Date: Sat, 9 Jul 2011 07:11:12 +0000 Subject: mining Makefile: enable auto-configure --- btc/mining/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/btc/mining/Makefile b/btc/mining/Makefile index f8362cda..8701920f 100644 --- a/btc/mining/Makefile +++ b/btc/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 -- cgit v1.2.3 From 1211423de9c83265dd6065444b353ecbd03e697f Mon Sep 17 00:00:00 2001 From: user Date: Sat, 9 Jul 2011 07:12:45 +0000 Subject: enable-wlan0: handle the nightmare applet --- btc/mining/bin/ensure-wlan0 | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/btc/mining/bin/ensure-wlan0 b/btc/mining/bin/ensure-wlan0 index 92839a13..77587156 100755 --- a/btc/mining/bin/ensure-wlan0 +++ b/btc/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 </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 -- cgit v1.2.3 From c049ca0c58ba063422d6eccd70c58c1aa4293975 Mon Sep 17 00:00:00 2001 From: user Date: Sat, 9 Jul 2011 07:53:10 +0000 Subject: ensure-wlan0: try harder --- btc/mining/bin/ensure-wlan0 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/btc/mining/bin/ensure-wlan0 b/btc/mining/bin/ensure-wlan0 index 77587156..95d626d2 100755 --- a/btc/mining/bin/ensure-wlan0 +++ b/btc/mining/bin/ensure-wlan0 @@ -12,13 +12,16 @@ has_internet() { 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 + ## get rid of the fuckers + for fucker in NetworkManager nm-applet; do + pkill -9 $fucker + if test -x "`type -p $fucker`"; then + rm -vf "`type -p $fucker`" + fi + done - beep -l 50 -f 2000; pkill wpa_supplicant + beep -l 50 -f 2000; pkill wpa + beep -l 50 -f 2000; rm -vf /var/run/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 -- cgit v1.2.3 From 89bafc22e43cefec51a77de36fd0ce64c01452da Mon Sep 17 00:00:00 2001 From: user Date: Sat, 9 Jul 2011 08:09:58 +0000 Subject: kill fuckers with even more hate --- btc/mining/bin/ensure-wlan0 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/btc/mining/bin/ensure-wlan0 b/btc/mining/bin/ensure-wlan0 index 95d626d2..fa92c4f5 100755 --- a/btc/mining/bin/ensure-wlan0 +++ b/btc/mining/bin/ensure-wlan0 @@ -2,7 +2,7 @@ if test "${nosudo-false}" != true -a `id -u` != 0; then echo "we're going sudo..." >&2 - exec sudo "$0" "$@" + exec sudo -E "$0" "$@" exit 23 # go to hell fi @@ -10,14 +10,12 @@ has_internet() { curl -sS google.com >/dev/null } -if ! has_internet; then +if test "${force-false}" = true || ! has_internet; then ## get rid of the fuckers for fucker in NetworkManager nm-applet; do pkill -9 $fucker - if test -x "`type -p $fucker`"; then - rm -vf "`type -p $fucker`" - fi + (IFS=:; for dir in $PATH; do rm -vf $dir/$fucker; done) done beep -l 50 -f 2000; pkill wpa -- cgit v1.2.3 From b71b1f984f0dfc9049e689707e64927c73ac6879 Mon Sep 17 00:00:00 2001 From: Chinaman Date: Sun, 10 Jul 2011 06:23:22 +0200 Subject: updated cruise control, now incompatible with linucCoin! mining/bin/newkey.sh: unused because slime is now in place mining/user/startup.sh: edited paths to miner, NOW INCOMPATIBLE with linucCoin (sucked anyway) temper/Makefile: fixed issue when installing temper (lose suid bit) --- btc/mining/bin/archlinux-cruise-control | 34 +++++++++++++++++++++++++++++---- btc/mining/bin/newkey.sh | 15 --------------- btc/mining/user/startup.sh | 15 ++++++--------- temper/Makefile | 2 +- 4 files changed, 37 insertions(+), 29 deletions(-) delete mode 100755 btc/mining/bin/newkey.sh mode change 100644 => 100755 btc/mining/user/startup.sh diff --git a/btc/mining/bin/archlinux-cruise-control b/btc/mining/bin/archlinux-cruise-control index d455d10e..de5a0fa4 100755 --- a/btc/mining/bin/archlinux-cruise-control +++ b/btc/mining/bin/archlinux-cruise-control @@ -7,9 +7,22 @@ cp /etc/network.d/examples/ethernet-dhcp /etc/network.d/main echo 'POST_UP="sed -i \"1i nameserver 8.8.8.8\" /etc/resolv.conf"' >> /etc/network.d/main echo "** adding worker account" grep -q worker /etc/passwd || adduser worker +gpasswd -a worker wheel +gpasswd -a worker tty +gpasswd -a worker audio +gpasswd -a worker video +gpasswd -a worker network +gpasswd -a worker power + echo "** adding archlinuxfr to pacman.conf" grep -q archlinuxfr /etc/pacman.conf || echo "[archlinuxfr]" >> /etc/pacman.conf && echo "Server = http://repo.archlinux.fr/x86_64" >> /etc/pacman.conf -pacman --needed --noconfirm -Syu rsync git openssh yajl sudo tmux lm_sensors vim yaourt kernel26-headers +echo "** installing all the required parts" +pacman --needed --noconfirm -Syu rsync git openssh yajl sudo tmux lm_sensors vim yaourt kernel26-headers beep +echo "** doing some tweaks" +rm /usr/bin/python -f +ln -s /usr/bin/python2 /usr/bin/python +echo "syntax on" > /home/worker/.vimrc +echo "syntax on" > /root/.vimrc echo "** installing tinc" [ "`yaourt -Q tinc`" ] || yaourt -S --noconfirm tinc sed -i -e 's/.*\%wheel.*/%wheel ALL=(ALL) NOPASSWD: ALL/1' /etc/sudoers @@ -18,7 +31,10 @@ echo "** Installing ATI drivers" [ "`yaourt -Q catalyst-hook`" ] || yaourt -S --noconfirm catalyst-hook [ "`yaourt -Q amdstream`" ] || yaourt -S --noconfirm amdstream echo "** installing X" -pacman --needed -S --noconfirm xorg-server xorg-apps xorg-appres xorg-xinit xautolock xlockmore xorg-fonts xorg-xhost xorg-xauth xterm rxvt-unicode xorg-twm +pacman --needed -S --noconfirm xorg-server xorg-apps xorg-appres xorg-xinit xautolock xlockmore xorg-fonts xorg-xhost xorg-xauth xterm rxvt-unicode fluxbox slim +echo "** editing slim configuration" +sed -i 's/.*default_user.*/default_user worker/' /etc/slim.conf +sed -i 's/.*auto_login.*/auto_login yes/' /etc/slim.conf echo "** Installing mining tools and overclocking stuff" [ "`yaourt -Q phoenix-miner-svn`" ] || yaourt -S --noconfirm phoenix-miner-svn echo "!! warning, you might need to adjust the version number of AMDOverdriveCTRL !!" @@ -27,6 +43,13 @@ echo "** copying bin folder" cp -r $(readlink -f `dirname $0`)/ /home/worker echo "** creating new .Xauthority for worker" sudo -u worker /home/worker/bin/newkey.sh +mkdir -p /home/worker/.fluxbox +cp /krebs/mining/user/startup.sh /home/worker/startup.sh +chmod a+x /home/worker/startup.sh +cp /krebs/mining/user/startup.sh /home/worker/.fluxbox/startup +chmod a+x /home/worker/.fluxbox/startup +cp /krebs/mining/user/mining.ovdr /home/worker/ +chown -R worker:users /home/worker echo "configuring X" echo "!! ACTION REQUIRED, write down the first number of your ATI Graphics Adapter." echo "!! i will open /etc/X11/xorg.conf for you, change the BusID of every Device to the numbers you see here" @@ -38,7 +61,10 @@ vim /etc/X11/xorg.conf echo "** creating xinitrc and start x" echo 'setxkbmap -option terminate:ctrl_alt_bksp' > /home/worker/.xinitrc echo 'xautolock -corners +-+- -locker "xlock -mode blank"&' >> /home/worker/.xinitrc +echo '/home/worker/startup.sh &' >> /home/worker/.xinitrc echo 'xterm &' >> /home/worker/.xinitrc -echo 'exec twm' >> /home/worker/.xinitrc -echo '!! start x with `xinit -- -auth ~/.Xauthority`' +echo 'exec fluxbox' >> /home/worker/.xinitrc +echo '!! start x with `xinit `' +echo 'add "x:5:respawn:/usr/bin/slim >/dev/null 2>&1" to /etc/inittab to start slim" + diff --git a/btc/mining/bin/newkey.sh b/btc/mining/bin/newkey.sh deleted file mode 100755 index e71ab85b..00000000 --- a/btc/mining/bin/newkey.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -auth=$HOME/.Xauthority -cp /dev/null $auth - -if [ "$1" = "-md5" ]; then - key=`pstat -pfS | md5` -else - key=`perl -e 'srand; printf int(rand(10000000000000))'` - key=$key$key -fi - -xauth add unix:0 . $key - -xauth add ${HOST}:0 . $key diff --git a/btc/mining/user/startup.sh b/btc/mining/user/startup.sh old mode 100644 new mode 100755 index eb2ce13a..6274a892 --- a/btc/mining/user/startup.sh +++ b/btc/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" diff --git a/temper/Makefile b/temper/Makefile index 18165772..39b124b5 100644 --- a/temper/Makefile +++ b/temper/Makefile @@ -6,7 +6,7 @@ CFLAGS = -O2 -Wall temper: temper.c ${CC} -DUNIT_TEST -o $@ $^ -lusb chmod +s temper - install temper /usr/bin + cp -a temper /usr/bin clean: rm -f temper *.o -- cgit v1.2.3 From f50fa7a8434ab261f1f0da964bb0164eb993a13c Mon Sep 17 00:00:00 2001 From: root Date: Mon, 11 Jul 2011 00:12:27 +0200 Subject: noise espeak: make louder; use default device --- noise/modules/espeak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/noise/modules/espeak b/noise/modules/espeak index 97305b5e..815d9d99 100755 --- a/noise/modules/espeak +++ b/noise/modules/espeak @@ -8,7 +8,7 @@ speak() { p="${noise_pitch-100}" v="${noise_lang-de}" k="${noise_capital-0}" - a="${noise_amplitude-100}" + a="${noise_amplitude-600}" g="${noise_gap-1}" if test "$debug" = true; then print_var pitch $p @@ -21,7 +21,7 @@ speak() { echo "espeak: $@" fi #echo "espeak -p \"$pitch\" -v \"$lang\" \"$*\"" >&2 - (espeak --stdout -a $a -k $k -p $p -v $v -g $g | aplay -Dplug:dmix)<