[xen-tools-dev] [PATCH] Replace tabs with spaces
Stéphane Jourdois
sjourdois at gmail.com
Sun Jul 11 15:38:53 CEST 2010
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"...
---
bin/xen-create-image | 28 +++++++-------
bin/xen-list-images | 4 +-
bin/xen-update-image | 22 +++++-----
bin/xt-customize-image | 12 +++---
bin/xt-guess-suite-and-mirror | 4 +-
bin/xt-install-image | 32 ++++++++--------
hooks/centos-4/40-setup-networking | 8 ++--
hooks/centos-5/40-setup-networking | 8 ++--
hooks/common.sh | 18 ++++----
hooks/dapper/40-setup-networking | 8 ++--
hooks/dapper/50-setup-hostname | 12 +++---
hooks/debian/15-disable-hwclock | 2 +-
hooks/debian/40-setup-networking | 8 ++--
hooks/debian/50-setup-hostname | 12 +++---
hooks/debian/55-create-dev | 4 +-
hooks/debian/80-install-kernel | 64 +++++++++++++++---------------
hooks/debian/95-configure-locales | 2 +-
hooks/edgy/40-setup-networking | 8 ++--
hooks/edgy/50-setup-hostname | 12 +++---
hooks/edgy/80-install-kernel | 32 ++++++++--------
hooks/fedora-core-6/40-setup-networking | 8 ++--
hooks/gentoo/40-setup-networking | 8 ++--
hooks/intrepid/30-disable-gettys | 4 +-
hooks/intrepid/40-setup-networking | 8 ++--
hooks/intrepid/50-setup-hostname | 12 +++---
hooks/intrepid/80-install-kernel | 16 ++++----
hooks/karmic/30-disable-gettys | 4 +-
hooks/karmic/40-setup-networking | 8 ++--
hooks/karmic/50-setup-hostname | 12 +++---
t/portable-shell.t | 6 +-
t/xen-tools-log.t | 12 +++---
t/xen-tools.t | 6 +-
32 files changed, 202 insertions(+), 202 deletions(-)
diff --git a/bin/xen-create-image b/bin/xen-create-image
index a0efaa1..d4a9f14 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -236,7 +236,7 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
--nameserver=123.456.789.ABC
Setup the nameserver of the machine, multiple nameservers
- are allowed.
+ are allowed.
--bridge=brname
Optionally, set a specific bridge for the new instance.
@@ -1339,17 +1339,17 @@ sub setupDefaultOptions
# Initialize per distribution mirror defaults: Debian
foreach my $debdist (qw(etch lenny squeeze sid testing stable unstable)) {
- $CONFIG{ 'mirror_'.$debdist } = $CONFIG{ 'mirror' }
+ $CONFIG{ 'mirror_'.$debdist } = $CONFIG{ 'mirror' }
}
foreach my $debdist (qw(sarge)) {
- $CONFIG{ 'mirror_'.$debdist } = 'http://archive.debian.org/debian';
+ $CONFIG{ 'mirror_'.$debdist } = 'http://archive.debian.org/debian';
}
# Initialize per distribution mirror defaults: Ubuntu
foreach my $ubuntudist (qw(dapper hardy intrepid jaunty karmic lucid maverick)) {
- $CONFIG{ 'mirror_'.$ubuntudist } = 'http://archive.ubuntu.com/ubuntu';
+ $CONFIG{ 'mirror_'.$ubuntudist } = 'http://archive.ubuntu.com/ubuntu';
}
foreach my $ubuntudist (qw(edgy feisty gutsy)) {
- $CONFIG{ 'mirror_'.$ubuntudist } = 'http://old-releases.ubuntu.com/ubuntu';
+ $CONFIG{ 'mirror_'.$ubuntudist } = 'http://old-releases.ubuntu.com/ubuntu';
}
$CONFIG{ 'arch' } = '';
$CONFIG{ 'fs' } = 'ext3';
@@ -1753,7 +1753,7 @@ sub checkArguments
# Sarge amd64 needs different default mirror
#
if ( $CONFIG{ 'dist' } =~ /sarge/ and
- $CONFIG{ 'mirror_sarge' } eq 'http://archive.debian.org/debian' )
+ $CONFIG{ 'mirror_sarge' } eq 'http://archive.debian.org/debian' )
{
$CONFIG{ 'mirror_sarge' } = 'http://amd64.debian.net/debian';
}
@@ -1763,8 +1763,8 @@ sub checkArguments
#
my $distMirror = "mirror_" . $CONFIG{ 'dist' };
if ( !$CONFIG{ 'mirror' } and
- $CONFIG{ $distMirror } and
- length( $CONFIG{ $distMirror } ) )
+ $CONFIG{ $distMirror } and
+ length( $CONFIG{ $distMirror } ) )
{
$CONFIG{ 'mirror' } = $CONFIG{ $distMirror };
}
@@ -3398,7 +3398,7 @@ sub installSystem
# Propagate --debootstrap-cmd if install-method is debootstrap
#
if ( $CONFIG{ 'install-method' } eq 'debootstrap' and
- $CONFIG{ 'debootstrap-cmd' } )
+ $CONFIG{ 'debootstrap-cmd' } )
{
$cmd .= " --debootstrap-cmd=$CONFIG{'debootstrap-cmd'}";
}
@@ -3550,9 +3550,9 @@ sub runCustomisationHooks
# Restore domU's resolv.conf if needed
#
if (-f "$MOUNT_POINT/etc/resolv.conf") {
- mv("$MOUNT_POINT/etc/resolv.conf.old", "$MOUNT_POINT/etc/resolv.conf");
+ mv("$MOUNT_POINT/etc/resolv.conf.old", "$MOUNT_POINT/etc/resolv.conf");
} else {
- unlink "$MOUNT_POINT/etc/resolv.conf";
+ unlink "$MOUNT_POINT/etc/resolv.conf";
}
#
@@ -4024,13 +4024,13 @@ sub runCommand
if (!defined($rcopen)) {
logprint("Starting command '$cmd' failed: $!\n");
logprint("Aborting\n");
- print "See /var/log/xen-tools/$CONFIG{'hostname'}.log for details\n";
+ print "See /var/log/xen-tools/$CONFIG{'hostname'}.log for details\n";
$FAIL = 1;
exit 127;
}
while (my $line = <CMD>) {
- logonly $line;
+ logonly $line;
}
my $rcclose = close(CMD);
@@ -4041,7 +4041,7 @@ sub runCommand
{
logprint("Running command '$cmd' failed with exit code $?.\n");
logprint("Aborting\n");
- print "See /var/log/xen-tools/$CONFIG{'hostname'}.log for details\n";
+ print "See /var/log/xen-tools/$CONFIG{'hostname'}.log for details\n";
$FAIL = 1;
exit 127;
}
diff --git a/bin/xen-list-images b/bin/xen-list-images
index a0e62c4..327133c 100755
--- a/bin/xen-list-images
+++ b/bin/xen-list-images
@@ -240,8 +240,8 @@ sub parseCommandLineArguments
#
GetOptions( "test=s", \$CONFIG{ 'prefix' },
"help", \$HELP,
- "manual", \$MANUAL,
- "version", \$VERSION );
+ "manual", \$MANUAL,
+ "version", \$VERSION );
pod2usage(1) if $HELP;
pod2usage( -verbose => 2 ) if $MANUAL;
diff --git a/bin/xen-update-image b/bin/xen-update-image
index bfb3ccf..5ad9f4e 100755
--- a/bin/xen-update-image
+++ b/bin/xen-update-image
@@ -288,11 +288,11 @@ sub updateXenImage
if ( ( -e $tmp . "/usr/bin/apt-get" ) &&
( -x $tmp . "/usr/bin/apt-get" ) )
{
- #
- # Copy dom0's resolv.conf to domU
- #
- mv("$tmp/etc/resolv.conf", "$tmp/etc/resolv.conf.old") if -f "$tmp/etc/resolv.conf";
- cp("/etc/resolv.conf", "$tmp/etc/resolv.conf");
+ #
+ # Copy dom0's resolv.conf to domU
+ #
+ mv("$tmp/etc/resolv.conf", "$tmp/etc/resolv.conf.old") if -f "$tmp/etc/resolv.conf";
+ cp("/etc/resolv.conf", "$tmp/etc/resolv.conf");
#
# Now run the update command.
@@ -307,9 +307,9 @@ sub updateXenImage
"DEBIAN_FRONTEND=noninteractive chroot $tmp /usr/bin/apt-get upgrade --yes --force-yes"
);
- #
- # Restore domU's resolv.conf if needed
- #
+ #
+ # Restore domU's resolv.conf if needed
+ #
if (-f "$tmp/etc/resolv.conf") {
mv("$tmp/etc/resolv.conf.old", "$tmp/etc/resolv.conf");
} else {
@@ -453,11 +453,11 @@ sub parseCommandLineArguments
# Parse options.
#
GetOptions( "dir=s", \$CONFIG{ 'dir' },
- "lvm=s", \$CONFIG{ 'lvm' },
+ "lvm=s", \$CONFIG{ 'lvm' },
"evms=s", \$CONFIG{ 'evms' },
- "help", \$HELP,
+ "help", \$HELP,
"manual", \$MANUAL,
- "version", \$VERSION );
+ "version", \$VERSION );
pod2usage(1) if $HELP;
pod2usage( -verbose => 2 ) if $MANUAL;
diff --git a/bin/xt-customize-image b/bin/xt-customize-image
index a821a67..94bea93 100755
--- a/bin/xt-customize-image
+++ b/bin/xt-customize-image
@@ -322,9 +322,9 @@ sub runDistributionHooks
print "--\n";
my $rc = system($cmd);
if ($rc != 0) {
- print "hook $name failed: $?\n";
- exit 1;
- }
+ print "hook $name failed: $?\n";
+ exit 1;
+ }
print "--\n";
print "Done\n\n";
}
@@ -333,9 +333,9 @@ sub runDistributionHooks
print "Running hook $name\n";
my $rc = system($cmd);
if ($rc != 0) {
- print "hook $name failed: $?\n";
- exit 1;
- }
+ print "hook $name failed: $?\n";
+ exit 1;
+ }
print "hook $name: done.\n";
}
}
diff --git a/bin/xt-guess-suite-and-mirror b/bin/xt-guess-suite-and-mirror
index 525b798..265b46a 100755
--- a/bin/xt-guess-suite-and-mirror
+++ b/bin/xt-guess-suite-and-mirror
@@ -9,8 +9,8 @@ mirror for DomUs on Debian and Ubuntu Dom0s.
=head1 SYNOPSIS
- --suite Show suite
- --mirror Show mirror
+ --suite Show suite
+ --mirror Show mirror
Shows both if no parameter is given.
diff --git a/bin/xt-install-image b/bin/xt-install-image
index 402cc4c..2950d63 100755
--- a/bin/xt-install-image
+++ b/bin/xt-install-image
@@ -256,8 +256,8 @@ if ( defined( $CONFIG{ 'install-method' } ) &&
# Test that we have some "standard" files present.
#
- checkForCommonFilesInChroot($CONFIG{ 'location' },
- "installed system");
+ checkForCommonFilesInChroot($CONFIG{ 'location' },
+ "installed system");
#
# All done.
@@ -538,13 +538,13 @@ sub checkForCommonFilesInChroot {
my ($chroot, $what) = @_;
foreach my $file (qw( /bin/ls /bin/cp ))
{
- if ( !-x $chroot.$file )
- {
- print STDERR <<EOT;
+ if ( !-x $chroot.$file )
+ {
+ print STDERR <<EOT;
WARNING ($0): The $what at $chroot doesn\'t seem to be a full system.
WARNING ($0): The $what is missing the common file: $file.
EOT
- }
+ }
}
}
@@ -661,7 +661,7 @@ sub do_copy
# Check if the copy source has at least some "standard" files present.
#
checkForCommonFilesInChroot($CONFIG{ 'install-source' },
- "installation source");
+ "installation source");
#
# Find the copy command to run from the configuration file.
@@ -706,15 +706,15 @@ sub do_debootstrap
my $cachedir = $CONFIG{ 'cachedir' };
if ( !$cmd )
{
- if (-x '/usr/sbin/debootstrap') {
- $cmd = '/usr/sbin/debootstrap';
- } elsif (-x '/usr/sbin/cdebootstrap') {
- $cmd = '/usr/sbin/cdebootstrap';
- } else {
- print STDERR "Found neither debootstrap nor cdebootstrap and no --debootstrap-cmd given\n";
- exit 1;
- }
- print "Using $cmd as debootstrap command\n";
+ if (-x '/usr/sbin/debootstrap') {
+ $cmd = '/usr/sbin/debootstrap';
+ } elsif (-x '/usr/sbin/cdebootstrap') {
+ $cmd = '/usr/sbin/cdebootstrap';
+ } else {
+ print STDERR "Found neither debootstrap nor cdebootstrap and no --debootstrap-cmd given\n";
+ exit 1;
+ }
+ print "Using $cmd as debootstrap command\n";
}
diff --git a/hooks/centos-4/40-setup-networking b/hooks/centos-4/40-setup-networking
index 584d65f..980dcd4 100755
--- a/hooks/centos-4/40-setup-networking
+++ b/hooks/centos-4/40-setup-networking
@@ -79,10 +79,10 @@ E_O_STATIC
# will be restored after hooks are run.
#
if [ '*' != "*$nameserver" ]; then
- rm -f ${prefix}/etc/resolv.conf.old
- for ns in $nameserver; do
- echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
- done
+ rm -f ${prefix}/etc/resolv.conf.old
+ for ns in $nameserver; do
+ echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
+ done
fi
else
cat <<E_O_DHCP >${prefix}/etc/sysconfig/network-scripts/ifcfg-eth0
diff --git a/hooks/centos-5/40-setup-networking b/hooks/centos-5/40-setup-networking
index 584d65f..980dcd4 100755
--- a/hooks/centos-5/40-setup-networking
+++ b/hooks/centos-5/40-setup-networking
@@ -79,10 +79,10 @@ E_O_STATIC
# will be restored after hooks are run.
#
if [ '*' != "*$nameserver" ]; then
- rm -f ${prefix}/etc/resolv.conf.old
- for ns in $nameserver; do
- echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
- done
+ rm -f ${prefix}/etc/resolv.conf.old
+ for ns in $nameserver; do
+ echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
+ done
fi
else
cat <<E_O_DHCP >${prefix}/etc/sysconfig/network-scripts/ifcfg-eth0
diff --git a/hooks/common.sh b/hooks/common.sh
index 04dfb60..131dce1 100755
--- a/hooks/common.sh
+++ b/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
}
diff --git a/hooks/dapper/40-setup-networking b/hooks/dapper/40-setup-networking
index 5992b15..501c271 100755
--- a/hooks/dapper/40-setup-networking
+++ b/hooks/dapper/40-setup-networking
@@ -119,10 +119,10 @@ E_O_STATIC
# will be restored after hooks are run.
#
if [ '*' != "*$nameserver" ]; then
- rm -f ${prefix}/etc/resolv.conf.old
- for ns in $nameserver; do
- echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
- done
+ rm -f ${prefix}/etc/resolv.conf.old
+ for ns in $nameserver; do
+ echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
+ done
fi
}
diff --git a/hooks/dapper/50-setup-hostname b/hooks/dapper/50-setup-hostname
index 4bb62a5..5c89336 100755
--- a/hooks/dapper/50-setup-hostname
+++ b/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
diff --git a/hooks/debian/15-disable-hwclock b/hooks/debian/15-disable-hwclock
index 64fa4af..cfad99f 100755
--- a/hooks/debian/15-disable-hwclock
+++ b/hooks/debian/15-disable-hwclock
@@ -48,4 +48,4 @@ fi
#
# Log our finish
#
-logMessage Script $0 finished.
\ No newline at end of file
+logMessage Script $0 finished.
diff --git a/hooks/debian/40-setup-networking b/hooks/debian/40-setup-networking
index f3dfb8b..8c01eb6 100755
--- a/hooks/debian/40-setup-networking
+++ b/hooks/debian/40-setup-networking
@@ -139,10 +139,10 @@ E_O_STATIC
# will be restored after hooks are run.
#
if [ '*' != "*$nameserver" ]; then
- rm -f ${prefix}/etc/resolv.conf.old
- for ns in $nameserver; do
- echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
- done
+ rm -f ${prefix}/etc/resolv.conf.old
+ for ns in $nameserver; do
+ echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
+ done
fi
}
diff --git a/hooks/debian/50-setup-hostname b/hooks/debian/50-setup-hostname
index 4bb62a5..5c89336 100755
--- a/hooks/debian/50-setup-hostname
+++ b/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
diff --git a/hooks/debian/55-create-dev b/hooks/debian/55-create-dev
index e8bff33..9b3006c 100755
--- a/hooks/debian/55-create-dev
+++ b/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
diff --git a/hooks/debian/80-install-kernel b/hooks/debian/80-install-kernel
index e434631..75dbbdd 100755
--- a/hooks/debian/80-install-kernel
+++ b/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 at 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 at 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
#
diff --git a/hooks/debian/95-configure-locales b/hooks/debian/95-configure-locales
index 7d1713f..4900442 100755
--- a/hooks/debian/95-configure-locales
+++ b/hooks/debian/95-configure-locales
@@ -43,4 +43,4 @@ installDebianPackage ${prefix} util-linux-locales
#
# Log our finish
#
-logMessage Script $0 finished.
\ No newline at end of file
+logMessage Script $0 finished.
diff --git a/hooks/edgy/40-setup-networking b/hooks/edgy/40-setup-networking
index 74dd790..bbee228 100755
--- a/hooks/edgy/40-setup-networking
+++ b/hooks/edgy/40-setup-networking
@@ -128,10 +128,10 @@ E_O_STATIC
# will be restored after hooks are run.
#
if [ '*' != "*$nameserver" ]; then
- rm -f ${prefix}/etc/resolv.conf.old
- for ns in $nameserver; do
- echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
- done
+ rm -f ${prefix}/etc/resolv.conf.old
+ for ns in $nameserver; do
+ echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
+ done
fi
}
diff --git a/hooks/edgy/50-setup-hostname b/hooks/edgy/50-setup-hostname
index 4bb62a5..5c89336 100755
--- a/hooks/edgy/50-setup-hostname
+++ b/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
diff --git a/hooks/edgy/80-install-kernel b/hooks/edgy/80-install-kernel
index e7d9e2a..713c7aa 100755
--- a/hooks/edgy/80-install-kernel
+++ b/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
#
diff --git a/hooks/fedora-core-6/40-setup-networking b/hooks/fedora-core-6/40-setup-networking
index 584d65f..980dcd4 100755
--- a/hooks/fedora-core-6/40-setup-networking
+++ b/hooks/fedora-core-6/40-setup-networking
@@ -79,10 +79,10 @@ E_O_STATIC
# will be restored after hooks are run.
#
if [ '*' != "*$nameserver" ]; then
- rm -f ${prefix}/etc/resolv.conf.old
- for ns in $nameserver; do
- echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
- done
+ rm -f ${prefix}/etc/resolv.conf.old
+ for ns in $nameserver; do
+ echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
+ done
fi
else
cat <<E_O_DHCP >${prefix}/etc/sysconfig/network-scripts/ifcfg-eth0
diff --git a/hooks/gentoo/40-setup-networking b/hooks/gentoo/40-setup-networking
index 3035de3..6434aae 100755
--- a/hooks/gentoo/40-setup-networking
+++ b/hooks/gentoo/40-setup-networking
@@ -103,10 +103,10 @@ E_O_STATIC
# will be restored after hooks are run.
#
if [ '*' != "*$nameserver" ]; then
- rm -f ${prefix}/etc/resolv.conf.old
- for ns in $nameserver; do
- echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
- done
+ rm -f ${prefix}/etc/resolv.conf.old
+ for ns in $nameserver; do
+ echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
+ done
fi
}
diff --git a/hooks/intrepid/30-disable-gettys b/hooks/intrepid/30-disable-gettys
index 333b61e..1acb076 100755
--- a/hooks/intrepid/30-disable-gettys
+++ b/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
diff --git a/hooks/intrepid/40-setup-networking b/hooks/intrepid/40-setup-networking
index 74dd790..bbee228 100755
--- a/hooks/intrepid/40-setup-networking
+++ b/hooks/intrepid/40-setup-networking
@@ -128,10 +128,10 @@ E_O_STATIC
# will be restored after hooks are run.
#
if [ '*' != "*$nameserver" ]; then
- rm -f ${prefix}/etc/resolv.conf.old
- for ns in $nameserver; do
- echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
- done
+ rm -f ${prefix}/etc/resolv.conf.old
+ for ns in $nameserver; do
+ echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
+ done
fi
}
diff --git a/hooks/intrepid/50-setup-hostname b/hooks/intrepid/50-setup-hostname
index 4bb62a5..5c89336 100755
--- a/hooks/intrepid/50-setup-hostname
+++ b/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
diff --git a/hooks/intrepid/80-install-kernel b/hooks/intrepid/80-install-kernel
index df5fb4e..d4f18bf 100755
--- a/hooks/intrepid/80-install-kernel
+++ b/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
#
diff --git a/hooks/karmic/30-disable-gettys b/hooks/karmic/30-disable-gettys
index 6752e0c..104d17b 100755
--- a/hooks/karmic/30-disable-gettys
+++ b/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
diff --git a/hooks/karmic/40-setup-networking b/hooks/karmic/40-setup-networking
index 74dd790..bbee228 100755
--- a/hooks/karmic/40-setup-networking
+++ b/hooks/karmic/40-setup-networking
@@ -128,10 +128,10 @@ E_O_STATIC
# will be restored after hooks are run.
#
if [ '*' != "*$nameserver" ]; then
- rm -f ${prefix}/etc/resolv.conf.old
- for ns in $nameserver; do
- echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
- done
+ rm -f ${prefix}/etc/resolv.conf.old
+ for ns in $nameserver; do
+ echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
+ done
fi
}
diff --git a/hooks/karmic/50-setup-hostname b/hooks/karmic/50-setup-hostname
index 4bb62a5..5c89336 100755
--- a/hooks/karmic/50-setup-hostname
+++ b/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
diff --git a/t/portable-shell.t b/t/portable-shell.t
index 58c5b9e..341ef79 100755
--- a/t/portable-shell.t
+++ b/t/portable-shell.t
@@ -87,9 +87,9 @@ sub checkFile
is( $result, 0, "Shell script passes our portability check: $file" );
if (-x "/usr/bin/checkbashisms") {
- # Check for bashisms
- $result = `/usr/bin/checkbashisms '$file'`;
- is( $result, '', "Shell script passes check for bashisms: $file" );
+ # Check for bashisms
+ $result = `/usr/bin/checkbashisms '$file'`;
+ is( $result, '', "Shell script passes check for bashisms: $file" );
}
}
diff --git a/t/xen-tools-log.t b/t/xen-tools-log.t
index adf3bcf..d2ad5f2 100755
--- a/t/xen-tools-log.t
+++ b/t/xen-tools-log.t
@@ -8,13 +8,13 @@ use File::Temp;
use Xen::Tools::Log;
SKIP: {
- skip "Xen::Tools::Log is not used for now", 1;
+ skip "Xen::Tools::Log is not used for now", 1;
- my $dir = File::Temp::tempdir( CLEANUP => 1 );
+ my $dir = File::Temp::tempdir( CLEANUP => 1 );
- my $xtl = Xen::Tools::Log->new( hostname => 'xen-tools-log-test',
- logpath => $dir,
- );
+ my $xtl = Xen::Tools::Log->new( hostname => 'xen-tools-log-test',
+ logpath => $dir,
+ );
- ok( $xtl->isa('Xen::Tools::Log') );
+ ok( $xtl->isa('Xen::Tools::Log') );
}
diff --git a/t/xen-tools.t b/t/xen-tools.t
index 54f5758..5c17341 100755
--- a/t/xen-tools.t
+++ b/t/xen-tools.t
@@ -11,8 +11,8 @@ use Test::More tests => 1;
use Xen::Tools;
SKIP: {
- skip "Xen::Tools is not used for now", 1;
+ skip "Xen::Tools is not used for now", 1;
- my $xt = Xen::Tools->new( hostname => 'xen-tools-test' );
- ok( $xt->isa('Xen::Tools') );
+ my $xt = Xen::Tools->new( hostname => 'xen-tools-test' );
+ ok( $xt->isa('Xen::Tools') );
}
--
1.5.6.5
More information about the xen-tools-dev
mailing list