diff -uprN -X /home/eric/etc/dontdiff /home/eric/src/xen-tools/hooks/centos4/40-setup-networking /home/eric/dev/xen-tools/hooks/centos4/40-setup-networking
--- /home/eric/src/xen-tools/hooks/centos4/40-setup-networking	2006-06-15 09:47:02.000000000 +0200
+++ /home/eric/dev/xen-tools/hooks/centos4/40-setup-networking	2006-10-19 17:02:34.000000000 +0200
@@ -35,7 +35,7 @@ mkdir -p ${prefix}/etc/sysconfig/network
 #
 #  Test for static vs. DHCP
 #
-if [[ -z "${dhcp}" ]]; then
+if [ -z "${dhcp}" ]; then
     
     #
     #  Setup the initial interface
@@ -95,4 +95,4 @@ EOF
 #
 #  Log our finish
 #
-logMessage Script $0 finished
\ Pas de fin de ligne à la fin du fichier.
+logMessage Script $0 finished
diff -uprN -X /home/eric/etc/dontdiff /home/eric/src/xen-tools/hooks/centos4/50-setup-hostname /home/eric/dev/xen-tools/hooks/centos4/50-setup-hostname
--- /home/eric/src/xen-tools/hooks/centos4/50-setup-hostname	2006-06-15 09:47:02.000000000 +0200
+++ /home/eric/dev/xen-tools/hooks/centos4/50-setup-hostname	2006-10-19 17:02:52.000000000 +0200
@@ -39,7 +39,7 @@ echo ${hostname} > ${prefix}/etc/mailnam
 #  Fixup the /etc/hosts file upon the new image for
 # machines with static IPs
 #
-if [[ -z "${dhcp}" ]]; then
+if [ -z "${dhcp}" ]; then
 
     # Non-IPv6 stuff.
     grep -v '\(::\|IPv6\)' /etc/hosts > ${prefix}/etc/hosts
@@ -56,7 +56,7 @@ fi
 #
 #  Allow the host system to know the IP address of our new guest.
 #
-if [[ -z "${dhcp}" ]]; then
+if [ -z "${dhcp}" ]; then
 
     if ( grep ${hostname} /etc/hosts > /dev/null ) ; then
 
diff -uprN -X /home/eric/etc/dontdiff /home/eric/src/xen-tools/hooks/common.sh /home/eric/dev/xen-tools/hooks/common.sh
--- /home/eric/src/xen-tools/hooks/common.sh	2006-08-25 12:54:25.000000000 +0200
+++ /home/eric/dev/xen-tools/hooks/common.sh	2006-10-19 16:22:08.000000000 +0200
@@ -16,7 +16,7 @@
 #
 #  If we're running verbosely show a message, otherwise swallow it.
 #
-function logMessage
+logMessage ()
 {
     message="$*"
 
@@ -48,7 +48,7 @@ assert ()
 #
 #  Install a Debian package via apt-get.
 #
-function installDebianPackage
+installDebianPackage ()
 {
     prefix=$1
     package=$2
@@ -81,7 +81,7 @@ function installDebianPackage
 #
 #  Remove a Debian package.
 #
-function removeDebianPackage
+removeDebianPackage ()
 {
     prefix=$1
     package=$2
@@ -113,7 +113,7 @@ function removeDebianPackage
 #
 #  Install a CentOS4 package via yum
 #
-function installCentOS4Package
+installCentOS4Package ()
 {
     prefix=$1
     package=$2
@@ -146,7 +146,7 @@ function installCentOS4Package
 #
 # TODO: STUB
 #
-function installGentooPackage
+installGentooPackage ()
 {
     prefix=$1
     package=$2
diff -uprN -X /home/eric/etc/dontdiff /home/eric/src/xen-tools/hooks/gentoo/40-setup-networking /home/eric/dev/xen-tools/hooks/gentoo/40-setup-networking
--- /home/eric/src/xen-tools/hooks/gentoo/40-setup-networking	2006-06-30 12:09:56.000000000 +0200
+++ /home/eric/dev/xen-tools/hooks/gentoo/40-setup-networking	2006-10-19 17:02:59.000000000 +0200
@@ -34,7 +34,7 @@ mkdir -p ${prefix}/etc/conf.d
 #
 #  A function to setup DHCP for our new image.
 #
-function setupDynamicNetworking
+setupDynamicNetworking ()
 {
     #
     # The host is using DHCP.
@@ -55,7 +55,7 @@ E_O_DHCP
 #
 #  A function to setup static IP addresses for our new image.
 #
-function  setupStaticNetworking
+setupStaticNetworking ()
 {
     #
     #  if $p2p is set then add a "pointtopoint" setting.
@@ -104,7 +104,7 @@ E_O_STATIC
 #
 #  Call the relevant function
 #
-if [[ -z "${dhcp}" ]]; then
+if [ -z "${dhcp}" ]; then
     logMessage "Setting up static networking"
     setupStaticNetworking
 
diff -uprN -X /home/eric/etc/dontdiff /home/eric/src/xen-tools/hooks/gentoo/50-setup-hostname /home/eric/dev/xen-tools/hooks/gentoo/50-setup-hostname
--- /home/eric/src/xen-tools/hooks/gentoo/50-setup-hostname	2006-06-21 00:52:56.000000000 +0200
+++ /home/eric/dev/xen-tools/hooks/gentoo/50-setup-hostname	2006-10-19 17:03:14.000000000 +0200
@@ -46,7 +46,7 @@ echo DNSDOMAIN=\"${domain}\" >> ${prefix
 #  Fixup the /etc/hosts file upon the new image for
 # machines with static IPs
 #
-if [[ -z "${dhcp}" ]]; then
+if [ -z "${dhcp}" ]; then
 
     # Non-IPv6 stuff.
     grep -v '\(::\|IPv6\)' /etc/hosts > ${prefix}/etc/hosts
@@ -63,7 +63,7 @@ fi
 #
 #  Allow the host system to know the IP address of our new guest.
 #
-if [[ -z "${dhcp}" ]]; then
+if [ -z "${dhcp}" ]; then
 
     if ( grep ${hostname} /etc/hosts > /dev/null ) ; then
 
diff -uprN -X /home/eric/etc/dontdiff /home/eric/src/xen-tools/hooks/ubuntu/40-setup-networking /home/eric/dev/xen-tools/hooks/ubuntu/40-setup-networking
--- /home/eric/src/xen-tools/hooks/ubuntu/40-setup-networking	2006-06-18 19:44:08.000000000 +0200
+++ /home/eric/dev/xen-tools/hooks/ubuntu/40-setup-networking	2006-10-19 17:03:22.000000000 +0200
@@ -35,7 +35,7 @@ mkdir -p ${prefix}/etc/network
 #
 #  A function to setup DHCP for our new image.
 #
-function setupDynamicNetworking
+setupDynamicNetworking ()
 {
     #
     # The host is using DHCP.
@@ -65,7 +65,7 @@ E_O_DHCP
 #
 #  A function to setup static IP addresses for our new image.
 #
-function  setupStaticNetworking
+setupStaticNetworking ()
 {
     #
     # We have a static IP address
@@ -120,7 +120,7 @@ E_O_STATIC
 #
 #  Call the relevant function
 #
-if [[ -z "${dhcp}" ]]; then
+if [ -z "${dhcp}" ]; then
     logMessage "Setting up static networking"
     setupStaticNetworking
 
@@ -133,4 +133,4 @@ fi
 #
 #  Log our finish
 #
-logMessage Script $0 finished
\ Pas de fin de ligne à la fin du fichier.
+logMessage Script $0 finished
diff -uprN -X /home/eric/etc/dontdiff /home/eric/src/xen-tools/hooks/ubuntu/50-setup-hostname /home/eric/dev/xen-tools/hooks/ubuntu/50-setup-hostname
--- /home/eric/src/xen-tools/hooks/ubuntu/50-setup-hostname	2006-06-18 19:44:08.000000000 +0200
+++ /home/eric/dev/xen-tools/hooks/ubuntu/50-setup-hostname	2006-10-19 17:00:18.000000000 +0200
@@ -39,7 +39,7 @@ echo ${hostname} > ${prefix}/etc/mailnam
 #  Fixup the /etc/hosts file upon the new image for
 # machines with static IPs
 #
-if [[ -z "${dhcp}" ]]; then
+if [ -z "${dhcp}" ]; then
 
     # Non-IPv6 stuff.
     grep -v '\(::\|IPv6\)' /etc/hosts > ${prefix}/etc/hosts
@@ -56,7 +56,7 @@ fi
 #
 #  Allow the host system to know the IP address of our new guest.
 #
-if [[ -z "${dhcp}" ]]; then
+if [ -z "${dhcp}" ]; then
 
     if ( grep ${hostname} /etc/hosts > /dev/null ) ; then