summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@krebs>2011-08-05 20:43:04 +0200
committerroot <root@krebs>2011-08-05 20:43:04 +0200
commit74cef9c067980b779979804d46c3768e244485b1 (patch)
tree28d28871c76a8a1b638a62554bdb7f09539bd628
parent0ad5d9198e93c015fda4810692f6d61f8fb891e9 (diff)
parent2ab0e9f24a2a0825112168d18069af9dfb9d8f94 (diff)
Merge branch 'master' of github.com:/krebscode/painload
-rwxr-xr-xbtc/mining/bin/ensure-router11
-rw-r--r--evan/satz-liste3
2 files changed, 13 insertions, 1 deletions
diff --git a/btc/mining/bin/ensure-router b/btc/mining/bin/ensure-router
index ec78f610..5eedabc9 100755
--- a/btc/mining/bin/ensure-router
+++ b/btc/mining/bin/ensure-router
@@ -8,10 +8,19 @@ fi
if=eth2
+rc() {
+ for x in /etc/init.d/$1 /etc/rc.d/$1; do
+ if test -x $x; then
+ $x restart
+ break
+ fi
+ done
+}
+
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; rc 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
diff --git a/evan/satz-liste b/evan/satz-liste
index ea0bbe57..e14a175a 100644
--- a/evan/satz-liste
+++ b/evan/satz-liste
@@ -8,3 +8,6 @@ muelltrennung bringt gutes karma
dokumentiere deine projekte
werbe neue mitglieder
fnord
+bewässere die Pfalnzen
+Öffne ein Fenster
+wische die tische