summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2012-04-21 14:39:21 +0100
committerRichard W.M. Jones <rjones@redhat.com>2012-04-21 14:39:21 +0100
commitc844a38d6e6990af00506afb434a6f7b40e5259f (patch)
treebe1a7e7d1de421a7af0da1bc1efbe62bb1dbc746
parent2152affd3008703974d0d5c65515f5695dafb9ca (diff)
downloadlibguestfs-c844a38d6e6990af00506afb434a6f7b40e5259f.tar.gz
libguestfs-c844a38d6e6990af00506afb434a6f7b40e5259f.tar.xz
libguestfs-c844a38d6e6990af00506afb434a6f7b40e5259f.zip
tests: Space before parens in perl code.
-rwxr-xr-xtests/guests/guest-aux/make-fedora-img.pl154
1 files changed, 77 insertions, 77 deletions
diff --git a/tests/guests/guest-aux/make-fedora-img.pl b/tests/guests/guest-aux/make-fedora-img.pl
index a26a9fd7..cb7cd96e 100755
--- a/tests/guests/guest-aux/make-fedora-img.pl
+++ b/tests/guests/guest-aux/make-fedora-img.pl
@@ -28,74 +28,74 @@ use Sys::Guestfs;
use File::Temp;
my @images;
-my $g = Sys::Guestfs->new();
+my $g = Sys::Guestfs->new ();
my $bootdev;
my $rootdev;
foreach ('LAYOUT', 'SRCDIR') {
- defined($ENV{$_}) or die "Missing environment variable: $_";
+ defined ($ENV{$_}) or die "Missing environment variable: $_";
}
if ($ENV{LAYOUT} eq 'partitions') {
push (@images, "fedora.img.tmp.$$");
- open(my $fstab, '>', "fstab.tmp.$$") or die;
+ open (my $fstab, '>', "fstab.tmp.$$") or die;
print $fstab <<EOF;
LABEL=BOOT /boot ext2 default 0 0
LABEL=ROOT / ext2 default 0 0
EOF
- close($fstab) or die;
+ close ($fstab) or die;
$bootdev = '/dev/sda1';
$rootdev = '/dev/sda2';
- open(my $img, '>', "fedora.img.tmp.$$") or die;
- truncate($img, 512*1024*1024) or die;
- close($img) or die;
+ open (my $img, '>', "fedora.img.tmp.$$") or die;
+ truncate ($img, 512*1024*1024) or die;
+ close ($img) or die;
- $g->add_drive("fedora.img.tmp.$$");
- $g->launch();
+ $g->add_drive ("fedora.img.tmp.$$");
+ $g->launch ();
- $g->part_init('/dev/sda', 'mbr');
- $g->part_add('/dev/sda', 'p', 64, 524287);
- $g->part_add('/dev/sda', 'p', 524288, -64);
+ $g->part_init ('/dev/sda', 'mbr');
+ $g->part_add ('/dev/sda', 'p', 64, 524287);
+ $g->part_add ('/dev/sda', 'p', 524288, -64);
}
elsif ($ENV{LAYOUT} eq 'partitions-md') {
- push(@images, "fedora-md1.img.tmp.$$", "fedora-md2.img.tmp.$$");
+ push (@images, "fedora-md1.img.tmp.$$", "fedora-md2.img.tmp.$$");
- open(my $fstab, '>', "fstab.tmp.$$") or die;
+ open (my $fstab, '>', "fstab.tmp.$$") or die;
print $fstab <<EOF;
/dev/md0 /boot ext2 default 0 0
LABEL=ROOT / ext2 default 0 0
EOF
- close($fstab) or die;
+ close ($fstab) or die;
$bootdev = '/dev/md/boot';
$rootdev = '/dev/md/root';
foreach my $img (@images) {
- open(my $fh, '>', $img) or die;
- truncate($fh, 512*1024*1024) or die;
- close($fh) or die;
+ open (my $fh, '>', $img) or die;
+ truncate ($fh, 512*1024*1024) or die;
+ close ($fh) or die;
- $g->add_drive($img);
+ $g->add_drive ($img);
}
- $g->launch();
+ $g->launch ();
# Format the disks.
foreach ('a', 'b') {
- $g->part_init("/dev/sd$_", 'mbr');
- $g->part_add("/dev/sd$_", 'p', 64, 524287);
- $g->part_add("/dev/sd$_", 'p', 524288, -64);
+ $g->part_init ("/dev/sd$_", 'mbr');
+ $g->part_add ("/dev/sd$_", 'p', 64, 524287);
+ $g->part_add ("/dev/sd$_", 'p', 524288, -64);
}
- $g->md_create('boot', ['/dev/sda1', '/dev/sdb1']);
- $g->md_create('root', ['/dev/sda2', '/dev/sdb2']);
+ $g->md_create ('boot', ['/dev/sda1', '/dev/sdb1']);
+ $g->md_create ('root', ['/dev/sda2', '/dev/sdb2']);
- open(my $mdadm, '>', "mdadm.tmp.$$") or die;
+ open (my $mdadm, '>', "mdadm.tmp.$$") or die;
print $mdadm <<EOF;
MAILADDR root
AUTO +imsm +1.x -all
@@ -103,13 +103,13 @@ EOF
my $i = 0;
foreach ('boot', 'root') {
- my %detail = $g->md_detail("/dev/md/$_");
+ my %detail = $g->md_detail ("/dev/md/$_");
print $mdadm "ARRAY /dev/md$i level=raid1 num-devices=2 UUID=",
$detail{uuid}, "\n";
$i++;
}
- close($mdadm) or die;
+ close ($mdadm) or die;
}
else {
@@ -117,55 +117,55 @@ else {
exit 1;
}
-$g->pvcreate($rootdev);
-$g->vgcreate('VG', [$rootdev]);
-$g->lvcreate('Root', 'VG', 32);
-$g->lvcreate('LV1', 'VG', 32);
-$g->lvcreate('LV2', 'VG', 32);
-$g->lvcreate('LV3', 'VG', 64);
+$g->pvcreate ($rootdev);
+$g->vgcreate ('VG', [$rootdev]);
+$g->lvcreate ('Root', 'VG', 32);
+$g->lvcreate ('LV1', 'VG', 32);
+$g->lvcreate ('LV2', 'VG', 32);
+$g->lvcreate ('LV3', 'VG', 64);
# Phony /boot filesystem
-$g->mkfs_opts('ext2', $bootdev, blocksize => 4096);
-$g->set_label($bootdev, 'BOOT');
-$g->set_e2uuid($bootdev, '01234567-0123-0123-0123-012345678901');
+$g->mkfs_opts ('ext2', $bootdev, blocksize => 4096);
+$g->set_label ($bootdev, 'BOOT');
+$g->set_e2uuid ($bootdev, '01234567-0123-0123-0123-012345678901');
# Phony root filesystem.
-$g->mkfs_opts('ext2', '/dev/VG/Root', blocksize => 4096);
-$g->set_label('/dev/VG/Root', 'ROOT');
-$g->set_e2uuid('/dev/VG/Root', '01234567-0123-0123-0123-012345678902');
+$g->mkfs_opts ('ext2', '/dev/VG/Root', blocksize => 4096);
+$g->set_label ('/dev/VG/Root', 'ROOT');
+$g->set_e2uuid ('/dev/VG/Root', '01234567-0123-0123-0123-012345678902');
# Enough to fool inspection API.
-$g->mount_options('', '/dev/VG/Root', '/');
-$g->mkdir('/boot');
-$g->mount_options('', $bootdev, '/boot');
-$g->mkdir('/bin');
-$g->mkdir('/etc');
-$g->mkdir('/etc/sysconfig');
-$g->mkdir('/usr');
-$g->mkdir_p('/var/lib/rpm');
-
-$g->upload("fstab.tmp.$$", '/etc/fstab');
-$g->write('/etc/redhat-release', 'Fedora release 14 (Phony)');
-$g->write('/etc/fedora-release', 'Fedora release 14 (Phony)');
-$g->write('/etc/sysconfig/network', 'HOSTNAME=fedora.invalid');
+$g->mount_options ('', '/dev/VG/Root', '/');
+$g->mkdir ('/boot');
+$g->mount_options ('', $bootdev, '/boot');
+$g->mkdir ('/bin');
+$g->mkdir ('/etc');
+$g->mkdir ('/etc/sysconfig');
+$g->mkdir ('/usr');
+$g->mkdir_p ('/var/lib/rpm');
+
+$g->upload ("fstab.tmp.$$", '/etc/fstab');
+$g->write ('/etc/redhat-release', 'Fedora release 14 (Phony)');
+$g->write ('/etc/fedora-release', 'Fedora release 14 (Phony)');
+$g->write ('/etc/sysconfig/network', 'HOSTNAME=fedora.invalid');
if (-f "mdadm.tmp.$$") {
- $g->upload("mdadm.tmp.$$", '/etc/mdadm.conf');
- unlink("mdadm.tmp.$$") or die;
+ $g->upload ("mdadm.tmp.$$", '/etc/mdadm.conf');
+ unlink ("mdadm.tmp.$$") or die;
}
-$g->upload('guest-aux/fedora-name.db', '/var/lib/rpm/Name');
-$g->upload('guest-aux/fedora-packages.db', '/var/lib/rpm/Packages');
+$g->upload ('guest-aux/fedora-name.db', '/var/lib/rpm/Name');
+$g->upload ('guest-aux/fedora-packages.db', '/var/lib/rpm/Packages');
-$g->upload($ENV{SRCDIR}.'/../data/bin-x86_64-dynamic', '/bin/ls');
+$g->upload ($ENV{SRCDIR}.'/../data/bin-x86_64-dynamic', '/bin/ls');
-$g->mkdir('/boot/grub');
-$g->touch('/boot/grub/grub.conf');
+$g->mkdir ('/boot/grub');
+$g->touch ('/boot/grub/grub.conf');
# Test files.
-$g->write('/etc/test1', 'abcdefg');
-$g->write('/etc/test2', '');
-$g->write('/etc/test3',
+$g->write ('/etc/test1', 'abcdefg');
+$g->write ('/etc/test2', '');
+$g->write ('/etc/test3',
'a
b
c
@@ -173,25 +173,25 @@ d
e
f
');
-$g->chown(10, 11, '/etc/test3');
-$g->chmod(0600, '/etc/test3');
-$g->write('/bin/test1', 'abcdefg');
-$g->write('/bin/test2', 'zxcvbnm');
-$g->write('/bin/test3', '1234567');
-$g->write('/bin/test4', '');
-$g->ln_s('/bin/test1', '/bin/test5');
-$g->mkfifo(0777, '/bin/test6');
-$g->mknod(0777, 10, 10, '/bin/test7');
+$g->chown (10, 11, '/etc/test3');
+$g->chmod (0600, '/etc/test3');
+$g->write ('/bin/test1', 'abcdefg');
+$g->write ('/bin/test2', 'zxcvbnm');
+$g->write ('/bin/test3', '1234567');
+$g->write ('/bin/test4', '');
+$g->ln_s ('/bin/test1', '/bin/test5');
+$g->mkfifo (0777, '/bin/test6');
+$g->mknod (0777, 10, 10, '/bin/test7');
# Other filesystems.
# Note that these should be empty, for testing virt-df.
-$g->mkfs_opts('ext2', '/dev/VG/LV1', blocksize => 4096);
-$g->mkfs_opts('ext2', '/dev/VG/LV2', blocksize => 1024);
-$g->mkfs_opts('ext2', '/dev/VG/LV3', blocksize => 2048);
+$g->mkfs_opts ('ext2', '/dev/VG/LV1', blocksize => 4096);
+$g->mkfs_opts ('ext2', '/dev/VG/LV2', blocksize => 1024);
+$g->mkfs_opts ('ext2', '/dev/VG/LV3', blocksize => 2048);
# Cleanup
-unlink("fstab.tmp.$$") or die;
+unlink ("fstab.tmp.$$") or die;
foreach my $img (@images) {
$img =~ /^(.*)\.tmp\.\d+$/ or die;
- rename($img, $1) or die;
+ rename ($img, $1) or die;
}