Replace tabs with spaces

This makes t/no-tabs.t pass.
I'm responsible for some tabs in previous patches, so this
fixes mine also :)

Note that I find this test silly, but "dura lex, sed lex"...

hooks/common.sh

@@ -226,18 +226,18 @@ installCentOS4Package ()
 #
 installPackage ()
 {
-	prefix=$1
-	package=$2
+        prefix=$1
+        package=$2
 
-	if [ -x ${prefix}/usr/bin/apt-get ] ; then
-		installDebianPackage "$@"
+        if [ -x ${prefix}/usr/bin/apt-get ] ; then
+                installDebianPackage "$@"
 
-	elif [ -x ${prefix}/usr/bin/yum ] ; then
-		installCentOS4Package "$@"
+        elif [ -x ${prefix}/usr/bin/yum ] ; then
+                installCentOS4Package "$@"
 
-	else
-		logMessage "Unable to install package ${package}; no package manager found"
-	fi
+        else
+                logMessage "Unable to install package ${package}; no package manager found"
+        fi
 }
 
 

hooks/dapper/50-setup-hostname

@@ -49,7 +49,7 @@ if [ -z "${copyhosts}" ]; then
     #  Copy localhost
     #
     cat > ${prefix}/etc/hosts <<EOF
-127.0.0.1	localhost
+127.0.0.1    localhost
 EOF
     #
     #  Make sure our hostname and FQDN is resolvable
@@ -59,11 +59,11 @@ EOF
         #  If dhcp is diabled, FQDN should resolve to our IP
         #
         cat >> ${prefix}/etc/hosts <<EOF
-${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
+${ip1}    $GUEST_FQDN $GUEST_HOSTNAME
 EOF
     else
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
+127.0.1.1    $GUEST_FQDN $GUEST_HOSTNAME
 EOF
     fi
 
@@ -86,12 +86,12 @@ else
     # New entry.
     if [ -z "${dhcp}" ]; then
         cat >> ${prefix}/etc/hosts <<EOF
-${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
+${ip1}    $GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     else
     cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
+127.0.1.1    $GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     fi
@@ -114,7 +114,7 @@ if [ -z "${dhcp}" ]; then
         if [ -z "${nohosts}" ]; then
 
             logMessage Adding $GUEST_FQDN and $GUEST_HOSTNAME to /etc/hosts on the host
-            echo "${ip1}	$GUEST_FQDN $GUEST_HOSTNAME" >> /etc/hosts
+            echo "${ip1}    $GUEST_FQDN $GUEST_HOSTNAME" >> /etc/hosts
 
             #
             #  If we've updated the /etc/hosts file on the host machine

hooks/debian/15-disable-hwclock

@@ -48,4 +48,4 @@ fi
 #
 # Log our finish
 #
-logMessage Script $0 finished.
+logMessage Script $0 finished.

hooks/debian/50-setup-hostname

@@ -49,7 +49,7 @@ if [ -z "${copyhosts}" ]; then
     #  Copy localhost
     #
     cat > ${prefix}/etc/hosts <<EOF
-127.0.0.1	localhost
+127.0.0.1    localhost
 EOF
     #
     #  Make sure our hostname and FQDN is resolvable
@@ -59,11 +59,11 @@ EOF
         #  If dhcp is diabled, FQDN should resolve to our IP
         #
         cat >> ${prefix}/etc/hosts <<EOF
-${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
+${ip1}    $GUEST_FQDN $GUEST_HOSTNAME
 EOF
     else
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
+127.0.1.1    $GUEST_FQDN $GUEST_HOSTNAME
 EOF
     fi
 
@@ -86,12 +86,12 @@ else
     # New entry.
     if [ -z "${dhcp}" ]; then
         cat >> ${prefix}/etc/hosts <<EOF
-${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
+${ip1}    $GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     else
     cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
+127.0.1.1    $GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     fi
@@ -114,7 +114,7 @@ if [ -z "${dhcp}" ]; then
         if [ -z "${nohosts}" ]; then
 
             logMessage Adding $GUEST_FQDN and $GUEST_HOSTNAME to /etc/hosts on the host
-            echo "${ip1}	$GUEST_FQDN $GUEST_HOSTNAME" >> /etc/hosts
+            echo "${ip1}    $GUEST_FQDN $GUEST_HOSTNAME" >> /etc/hosts
 
             #
             #  If we've updated the /etc/hosts file on the host machine

hooks/debian/55-create-dev

@@ -33,8 +33,8 @@ MAKEDEV=''
 MAKEDEV_PATHS="/sbin/MAKEDEV /dev/MAKEDEV"
 for MAKEDEV_PATH in ${MAKEDEV_PATHS}; do
     if [ -x "${prefix}${MAKEDEV_PATH}" ]; then
-	MAKEDEV="${prefix}${MAKEDEV_PATH}"
-	break
+    MAKEDEV="${prefix}${MAKEDEV_PATH}"
+    break
     fi
 done
 

hooks/debian/80-install-kernel

@@ -33,25 +33,25 @@ logMessage Script $0 starting
 #
 
 if [ "${arch}" = "i386" ]; then
-	XEN_ARCH="686"
+    XEN_ARCH="686"
 elif [ "${arch}" = "amd64" ]; then
-	XEN_ARCH="amd64"
+    XEN_ARCH="amd64"
 elif [ -z "${arch}" ]; then
-	UNAME_ARCH=`uname -m`
-	if [ "${UNAME_ARCH}" = "i686" ]; then
-		XEN_ARCH="686"
-	elif [ "${UNAME_ARCH}" = "x86_64" ]; then
-		XEN_ARCH="amd64"
-	else
-		logMessage Unknown kernel architecture ${UNAME_ARCH}.
-		logMessage Please report this as bug to xen-tools-dev@xen-tools.org.
-		logMessage Script $0 failed
-		exit 1
-	fi
+    UNAME_ARCH=`uname -m`
+    if [ "${UNAME_ARCH}" = "i686" ]; then
+        XEN_ARCH="686"
+    elif [ "${UNAME_ARCH}" = "x86_64" ]; then
+        XEN_ARCH="amd64"
+    else
+        logMessage Unknown kernel architecture ${UNAME_ARCH}.
+        logMessage Please report this as bug to xen-tools-dev@xen-tools.org.
+        logMessage Script $0 failed
+        exit 1
+    fi
 else
-	logMessage Unknown kernel architecture ${arch}
-	logMessage Script $0 failed
-	exit 1
+    logMessage Unknown kernel architecture ${arch}
+    logMessage Script $0 failed
+    exit 1
 fi
 
 #
@@ -68,19 +68,19 @@ if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_XEN_PKG > /dev/null 2>&1; th
     installDebianPackage ${prefix} $KERNEL_XEN_PKG
 
 else
-	logMessage Package $KERNEL_XEN_PKG is not available
-	logMessage Attempting to install the $KERNEL_PKG kernel image
-	logMessage WARNING: This kernel may not have pvops
-	if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
-		logMessage Package $KERNEL_PKG is available - installing
-	    installDebianPackage ${prefix} initramfs-tools
-	    installDebianPackage ${prefix} $KERNEL_PKG
-	else
-		logMessage Package $KERNEL_PKG is not available
-		logMessage pygrub set, but kernel could not be installed
-		logMessage Script $0 failed
-		exit 1
-	fi
+    logMessage Package $KERNEL_XEN_PKG is not available
+    logMessage Attempting to install the $KERNEL_PKG kernel image
+    logMessage WARNING: This kernel may not have pvops
+    if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
+        logMessage Package $KERNEL_PKG is available - installing
+        installDebianPackage ${prefix} initramfs-tools
+        installDebianPackage ${prefix} $KERNEL_PKG
+    else
+        logMessage Package $KERNEL_PKG is not available
+        logMessage pygrub set, but kernel could not be installed
+        logMessage Script $0 failed
+        exit 1
+    fi
 fi
 
 DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1))
@@ -93,10 +93,10 @@ DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${prefix}/etc/issue)
 #
 
 if [ -f ${prefix}/boot/$DOMU_RAMDISK ]; then
-	logMessage initrd exists, skipping generation
+    logMessage initrd exists, skipping generation
 else
-	logMessage initrd missing, generating
-	chroot ${prefix} update-initramfs -c -k $KERNEL_REV
+    logMessage initrd missing, generating
+    chroot ${prefix} update-initramfs -c -k $KERNEL_REV
 fi
 
 #

hooks/debian/95-configure-locales

@@ -43,4 +43,4 @@ installDebianPackage ${prefix} util-linux-locales
 #
 # Log our finish
 #
-logMessage Script $0 finished.
+logMessage Script $0 finished.

hooks/edgy/50-setup-hostname

@@ -49,7 +49,7 @@ if [ -z "${copyhosts}" ]; then
     #  Copy localhost
     #
     cat > ${prefix}/etc/hosts <<EOF
-127.0.0.1	localhost
+127.0.0.1    localhost
 EOF
     #
     #  Make sure our hostname and FQDN is resolvable
@@ -59,11 +59,11 @@ EOF
         #  If dhcp is diabled, FQDN should resolve to our IP
         #
         cat >> ${prefix}/etc/hosts <<EOF
-${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
+${ip1}    $GUEST_FQDN $GUEST_HOSTNAME
 EOF
     else
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
+127.0.1.1    $GUEST_FQDN $GUEST_HOSTNAME
 EOF
     fi
 
@@ -86,12 +86,12 @@ else
     # New entry.
     if [ -z "${dhcp}" ]; then
         cat >> ${prefix}/etc/hosts <<EOF
-${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
+${ip1}    $GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     else
     cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
+127.0.1.1    $GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     fi
@@ -114,7 +114,7 @@ if [ -z "${dhcp}" ]; then
         if [ -z "${nohosts}" ]; then
 
             logMessage Adding $GUEST_FQDN and $GUEST_HOSTNAME to /etc/hosts on the host
-            echo "${ip1}	$GUEST_FQDN $GUEST_HOSTNAME" >> /etc/hosts
+            echo "${ip1}    $GUEST_FQDN $GUEST_HOSTNAME" >> /etc/hosts
 
             #
             #  If we've updated the /etc/hosts file on the host machine

hooks/edgy/80-install-kernel

@@ -43,19 +43,19 @@ if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_XEN_PKG > /dev/null 2>&1; th
     installDebianPackage ${prefix} $KERNEL_XEN_PKG
 
 else
-	logMessage Package $KERNEL_XEN_PKG is not available
-	logMessage Attempting to install the $KERNEL_PKG kernel image
-	logMessage WARNING: This kernel may not have pvops
-	if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
-		logMessage Package $KERNEL_PKG is available - installing
-	    installDebianPackage ${prefix} initramfs-tools
-	    installDebianPackage ${prefix} $KERNEL_PKG
-	else
-		logMessage Package $KERNEL_PKG is not available
-		logMessage pygrub set, but kernel could not be installed
-		logMessage Script $0 failed
-		exit 1
-	fi
+    logMessage Package $KERNEL_XEN_PKG is not available
+    logMessage Attempting to install the $KERNEL_PKG kernel image
+    logMessage WARNING: This kernel may not have pvops
+    if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
+        logMessage Package $KERNEL_PKG is available - installing
+        installDebianPackage ${prefix} initramfs-tools
+        installDebianPackage ${prefix} $KERNEL_PKG
+    else
+        logMessage Package $KERNEL_PKG is not available
+        logMessage pygrub set, but kernel could not be installed
+        logMessage Script $0 failed
+        exit 1
+    fi
 fi
 
 DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1))
@@ -68,10 +68,10 @@ DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${prefix}/etc/issue)
 #
 
 if [ -f ${prefix}/boot/$DOMU_RAMDISK ]; then
-	logMessage initrd exists, skipping generation
+    logMessage initrd exists, skipping generation
 else
-	logMessage initrd missing, generating
-	chroot ${prefix} update-initramfs -c -k $KERNEL_REV
+    logMessage initrd missing, generating
+    chroot ${prefix} update-initramfs -c -k $KERNEL_REV
 fi
 
 #

hooks/intrepid/30-disable-gettys

@@ -29,8 +29,8 @@ logMessage Script $0 starting
 #
 rm -f ${prefix}/etc/event.d/tty[!1]
 [ -f ${prefix}/etc/event.d/tty1 ] && {
-	sed -i -e s/tty1/hvc0/ ${prefix}/etc/event.d/tty1
-	mv ${prefix}/etc/event.d/tty1 ${prefix}/etc/event.d/hvc0
+    sed -i -e s/tty1/hvc0/ ${prefix}/etc/event.d/tty1
+    mv ${prefix}/etc/event.d/tty1 ${prefix}/etc/event.d/hvc0
 }
 [ -f ${prefix}/etc/inittab ] && sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab
 

hooks/intrepid/50-setup-hostname

@@ -49,7 +49,7 @@ if [ -z "${copyhosts}" ]; then
     #  Copy localhost
     #
     cat > ${prefix}/etc/hosts <<EOF
-127.0.0.1	localhost
+127.0.0.1    localhost
 EOF
     #
     #  Make sure our hostname and FQDN is resolvable
@@ -59,11 +59,11 @@ EOF
         #  If dhcp is diabled, FQDN should resolve to our IP
         #
         cat >> ${prefix}/etc/hosts <<EOF
-${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
+${ip1}    $GUEST_FQDN $GUEST_HOSTNAME
 EOF
     else
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
+127.0.1.1    $GUEST_FQDN $GUEST_HOSTNAME
 EOF
     fi
 
@@ -86,12 +86,12 @@ else
     # New entry.
     if [ -z "${dhcp}" ]; then
         cat >> ${prefix}/etc/hosts <<EOF
-${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
+${ip1}    $GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     else
     cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
+127.0.1.1    $GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     fi
@@ -114,7 +114,7 @@ if [ -z "${dhcp}" ]; then
         if [ -z "${nohosts}" ]; then
 
             logMessage Adding $GUEST_FQDN and $GUEST_HOSTNAME to /etc/hosts on the host
-            echo "${ip1}	$GUEST_FQDN $GUEST_HOSTNAME" >> /etc/hosts
+            echo "${ip1}    $GUEST_FQDN $GUEST_HOSTNAME" >> /etc/hosts
 
             #
             #  If we've updated the /etc/hosts file on the host machine

hooks/intrepid/80-install-kernel

@@ -38,14 +38,14 @@ KERNEL_PKG="linux-image-server"
 logMessage Attempting to install the $KERNEL_PKG kernel image
 logMessage WARNING: This kernel may not have pvops
 if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
-	logMessage Package $KERNEL_PKG is available - installing
+    logMessage Package $KERNEL_PKG is available - installing
     installDebianPackage ${prefix} initramfs-tools
     installDebianPackage ${prefix} $KERNEL_PKG
 else
-	logMessage Package $KERNEL_PKG is not available
-	logMessage pygrub set, but kernel could not be installed
-	logMessage Script $0 failed
-	exit 1
+    logMessage Package $KERNEL_PKG is not available
+    logMessage pygrub set, but kernel could not be installed
+    logMessage Script $0 failed
+    exit 1
 fi
 
 DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1))
@@ -58,10 +58,10 @@ DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${prefix}/etc/issue)
 #
 
 if [ -f ${prefix}/boot/$DOMU_RAMDISK ]; then
-	logMessage initrd exists, skipping generation
+    logMessage initrd exists, skipping generation
 else
-	logMessage initrd missing, generating
-	chroot ${prefix} update-initramfs -c -k $KERNEL_REV
+    logMessage initrd missing, generating
+    chroot ${prefix} update-initramfs -c -k $KERNEL_REV
 fi
 
 #

hooks/karmic/30-disable-gettys

@@ -29,8 +29,8 @@ logMessage Script $0 starting
 #
 rm -f ${prefix}/etc/init/tty[!1].conf
 [ -f ${prefix}/etc/event.d/tty1 ] && {
-	sed -i -e s/tty1/hvc0/ ${prefix}/etc/init/tty1.conf
-	mv ${prefix}/etc/init/tty1.conf  ${prefix}/etc/init/hvc0.conf
+    sed -i -e s/tty1/hvc0/ ${prefix}/etc/init/tty1.conf
+    mv ${prefix}/etc/init/tty1.conf  ${prefix}/etc/init/hvc0.conf
 }
 [ -f ${prefix}/etc/inittab ] && sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab
 

hooks/karmic/50-setup-hostname

@@ -49,7 +49,7 @@ if [ -z "${copyhosts}" ]; then
     #  Copy localhost
     #
     cat > ${prefix}/etc/hosts <<EOF
-127.0.0.1	localhost
+127.0.0.1    localhost
 EOF
     #
     #  Make sure our hostname and FQDN is resolvable
@@ -59,11 +59,11 @@ EOF
         #  If dhcp is diabled, FQDN should resolve to our IP
         #
         cat >> ${prefix}/etc/hosts <<EOF
-${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
+${ip1}    $GUEST_FQDN $GUEST_HOSTNAME
 EOF
     else
         cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
+127.0.1.1    $GUEST_FQDN $GUEST_HOSTNAME
 EOF
     fi
 
@@ -86,12 +86,12 @@ else
     # New entry.
     if [ -z "${dhcp}" ]; then
         cat >> ${prefix}/etc/hosts <<EOF
-${ip1}	$GUEST_FQDN $GUEST_HOSTNAME
+${ip1}    $GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     else
     cat >> ${prefix}/etc/hosts <<EOF
-127.0.1.1	$GUEST_FQDN $GUEST_HOSTNAME
+127.0.1.1    $GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     fi
@@ -114,7 +114,7 @@ if [ -z "${dhcp}" ]; then
         if [ -z "${nohosts}" ]; then
 
             logMessage Adding $GUEST_FQDN and $GUEST_HOSTNAME to /etc/hosts on the host
-            echo "${ip1}	$GUEST_FQDN $GUEST_HOSTNAME" >> /etc/hosts
+            echo "${ip1}    $GUEST_FQDN $GUEST_HOSTNAME" >> /etc/hosts
 
             #
             #  If we've updated the /etc/hosts file on the host machine