From afda5a76ab3d1b3f29a787f3087018504d7e2b71 Mon Sep 17 00:00:00 2001
From: Frank Villaro-Dixon <frank@vi-di.fr>
Date: Sat, 7 Dec 2013 15:42:02 +0100
Subject: [PATCH] Wifi and ethernet

---
 Utils/octopus.sh       | 10 ++++++----
 vim/spell/en.utf-8.add |  3 +++
 xinitrc                |  3 +--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Utils/octopus.sh b/Utils/octopus.sh
index 5189a99..ac6e4e2 100755
--- a/Utils/octopus.sh
+++ b/Utils/octopus.sh
@@ -107,6 +107,7 @@ case $1 in
 			$0 monitor extern
 		fi
 
+		sudo killall dhcpcd
 		$0 init-wifi &
 		$0 init-ethernet &
 		$0 init-mouse
@@ -119,13 +120,14 @@ case $1 in
 
 	"init-wifi")
 		sudo killall wpa_supplicant
-		sudo ifconfig wlan0 up &
-		sudo dhcpcd wlan0 &
-		sudo wpa_supplicant -iwlan0 -c/etc/wpa_supplicant/wpa_supplicant.conf
+		sudo wpa_supplicant -B -iwlan0 -c/etc/wpa_supplicant/wpa_supplicant.conf &
+		sleep 1
+		sudo ifconfig wlan0 up
+		sudo dhcpcd wlan0 -b -m 1000 -p -t 0 &
 		;;
 	"init-ethernet")
 		sudo ifconfig eth0 up &
-		sudo dhcpcd eth0 &
+		sudo dhcpcd eth0 -b -m 10 -p -t 0 &
 		;;
 
 
diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add
index d3f102d..d80e845 100644
--- a/vim/spell/en.utf-8.add
+++ b/vim/spell/en.utf-8.add
@@ -22,3 +22,6 @@ quux
 mutex
 batchs
 csv
+Battelle
+superlinéaires
+superlinéaire
diff --git a/xinitrc b/xinitrc
index 456ae87..e7f0240 100644
--- a/xinitrc
+++ b/xinitrc
@@ -30,8 +30,7 @@ setxkbmap -model pc104 -layout ch -variant fr -option compose:lwin
 #	xmodmap ~/.Xmodmap
 #fi
 
-$OCTOPUS init-all 1>&2 /dev/shm/Octopus_logs &
-$OCTOPUS init-wifi 1>&2 /dev/shm/Octopus_logs &
+$OCTOPUS init-all 1>> /dev/shm/Octopus_logs 2>> /dev/shm/Octopus_logs &
 ftpfct.sh >/dev/null &
 
 ps aux | grep mpd | grep -v grep