Remove trailing whitespaces in regular file
Change-Id: I5faf840dd6649afcb53e91f1d033447f9729cee1
This commit is contained in:
parent
165121f7b6
commit
3b719e50fb
1
AUTHORS
1
AUTHORS
@ -9,6 +9,7 @@ Devin Carlen <devin.carlen@gmail.com>
|
||||
Eddie Hebert <edhebert@gmail.com>
|
||||
Eoghan Glynn <eglynn@redhat.com>
|
||||
Gabriel Hurley <gabriel@strikeawe.com>
|
||||
Hengqing Hu <hudayou@hotmail.com>
|
||||
Jake Dahn <admin@jakedahn.com>
|
||||
James E. Blair <james.blair@rackspace.com>
|
||||
Jason Cannavale <jason.cannavale@rackspace.com>
|
||||
|
@ -147,7 +147,7 @@ cat > $LIBVIRT_XML <<EOF
|
||||
<interface type='network'>
|
||||
<source network='$NET_NAME'/>
|
||||
</interface>
|
||||
|
||||
|
||||
<!-- The order is significant here. File must be defined first -->
|
||||
<serial type="file">
|
||||
<source path='$vm_dir/console.log'/>
|
||||
|
@ -78,7 +78,7 @@ set -o xtrace
|
||||
. localrc
|
||||
|
||||
# Unlike kvm, ssh to the xen host to run tests, in case the test instance is launch with a host only network
|
||||
ssh root@$XEN_IP "cd devstack && . localrc && cd tools/jenkins && ./run_test.sh $EXECUTOR_NUMBER $ADAPTER '$RC'"
|
||||
ssh root@$XEN_IP "cd devstack && . localrc && cd tools/jenkins && ./run_test.sh $EXECUTOR_NUMBER $ADAPTER '$RC'"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
|
@ -1,5 +1,5 @@
|
||||
#!/bin/sh -e
|
||||
# Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
|
||||
# Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
|
||||
# This initial version of this file was taken from the source tree
|
||||
# of GlusterFS. It was not directly attributed, but is assumed to be
|
||||
# Copyright (c) 2010-2011 Gluster, Inc and release GPLv3
|
||||
|
@ -30,7 +30,7 @@ fi
|
||||
if [ ! -d files/apts ]; then
|
||||
echo "Please run this script from devstack/tools/"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# Mount the image
|
||||
STAGING_DIR=/tmp/`echo $1 | sed "s/\//_/g"`.stage
|
||||
|
@ -144,7 +144,7 @@ if [ ! -d $TOP_DIR/nova ]; then
|
||||
env GIT_SSL_NO_VERIFY=true git clone $NOVA_REPO
|
||||
cd $TOP_DIR/nova
|
||||
git checkout $NOVA_BRANCH
|
||||
fi
|
||||
fi
|
||||
|
||||
# Install plugins
|
||||
cp -pr $TOP_DIR/nova/plugins/xenserver/xenapi/etc/xapi.d /etc/
|
||||
|
@ -21,7 +21,7 @@ if [ -e /usr/bin/vim ]; then
|
||||
ln -s /usr/bin/vim /bin/vi
|
||||
fi
|
||||
|
||||
# Install git
|
||||
# Install git
|
||||
if ! which git; then
|
||||
DEST=/tmp/
|
||||
GITDIR=$DEST/git-1.7.7
|
||||
|
@ -88,7 +88,7 @@ EOF
|
||||
|
||||
get_params()
|
||||
{
|
||||
while getopts "hicwbf:d:v:m:p:k:r:l:" OPTION;
|
||||
while getopts "hicwbf:d:v:m:p:k:r:l:" OPTION;
|
||||
do
|
||||
case $OPTION in
|
||||
h) usage
|
||||
@ -246,7 +246,7 @@ create_management_vif()
|
||||
|
||||
|
||||
# This installs the interface for public traffic, only if a bridge is specified
|
||||
# The interface is not configured at this stage, but it will be, once the admin
|
||||
# The interface is not configured at this stage, but it will be, once the admin
|
||||
# tasks are complete for the services of this VPX
|
||||
create_public_vif()
|
||||
{
|
||||
|
@ -177,7 +177,7 @@ EOF
|
||||
/sbin/mkfs.ext3 -I 128 -m0 -F "$partition"
|
||||
/sbin/e2label "$partition" vpxroot
|
||||
make_fs_inner "$staging" "$partition" ""
|
||||
|
||||
|
||||
# Now run grub on the image we've created
|
||||
CLEAN_MOUNTPOINT=$(mktemp -d "$TMPDIR/mkfs-XXXXXX")
|
||||
|
||||
@ -203,7 +203,7 @@ EOF
|
||||
|
||||
$SUDO umount "$CLEAN_MOUNTPOINT"
|
||||
CLEAN_MOUNTPOINT=
|
||||
|
||||
|
||||
# Grub expects a disk with name /dev/xxxx with a first partition
|
||||
# named /dev/xxxx1, so we give it what it wants using symlinks
|
||||
# Note: /dev is linked to the real /dev of the build machine, so
|
||||
@ -214,14 +214,14 @@ EOF
|
||||
rm -f "$disk_part1_name"
|
||||
ln -s "$CLEAN_LOSETUP" "$disk_name"
|
||||
ln -s "$partition" "$disk_part1_name"
|
||||
|
||||
|
||||
# Feed commands into the grub shell to setup the disk
|
||||
grub --no-curses --device-map=/dev/null <<EOF
|
||||
device (hd0) $disk_name
|
||||
setup (hd0) (hd0,0)
|
||||
quit
|
||||
EOF
|
||||
|
||||
|
||||
# Cleanup
|
||||
rm -f "$disk_name"
|
||||
rm -f "$disk_part1_name"
|
||||
@ -253,7 +253,7 @@ splitvdi () {
|
||||
local n_bytes=$(stat --printf=%s "$diskimg")
|
||||
local n_meg=$((($n_bytes+$((1024*1024 -1)))/$((1024*1024))))
|
||||
local i=0
|
||||
while [ $i -lt $n_meg ] ; do
|
||||
while [ $i -lt $n_meg ] ; do
|
||||
if [ $rio -eq 0 ] ; then
|
||||
local file="$outputdir"/chunk-$(printf "%08d" $i)
|
||||
dd if="$diskimg" of="$file" skip=$i bs=1M count=1 2>/dev/null
|
||||
@ -359,7 +359,7 @@ done
|
||||
|
||||
|
||||
# cleanup
|
||||
if [ -z "${DO_NOT_CLEANUP:-}" ] ; then
|
||||
if [ -z "${DO_NOT_CLEANUP:-}" ] ; then
|
||||
rm -rf "$XVA_TARBALL_STAGING"
|
||||
rm -f "$FS_TMPFILE"
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user