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
commit0be2076bde83797ac0161274dd23110f94f4f8b0 (patch)
tree306e3901f890039417ca15e428d15b4b98fd4f32
parenta065137982f8ed4de22f7f6f2fa28a0ceb14e7fd (diff)
parent0e1607782f1ca21444989d94eab9b33b3abd60fa (diff)
Merge branch 'master' of github.com:/krebscode/painload
-rw-r--r--evan/satz-liste3
-rwxr-xr-xmining/bin/ensure-router11
2 files changed, 13 insertions, 1 deletions
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
diff --git a/mining/bin/ensure-router b/mining/bin/ensure-router
index ec78f610..5eedabc9 100755
--- a/mining/bin/ensure-router
+++ b/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