--- a/kvmtool Sat Aug 08 01:20:27 2009 +0200
+++ b/kvmtool Mon Aug 10 22:50:28 2009 +0200
@@ -14,10 +14,10 @@
my $opt_dev = "/dev/kvm";
my $opt_dir = "/var/lib/kvm";
-my $KVM = "kvm";
-my $CONFIG = "%s.kvm.conf";
+my $KVM = "kvm";
+my $CONFIG = "%s.kvm.conf";
my $PIDFILE = "$ENV{HOME}/.kvm-%s.pid";
-my $KILL = 15;
+my $KILL = 15;
sub _start(@);
sub _kill(@);
@@ -28,7 +28,7 @@
"h|help" => sub { pod2usage(-verbose => 1, -exit => 0) },
"m|man" => sub { pod2usage(-verbose => 2, -exit => 0) },
"dev=s" => \$opt_dev,
- "dir=s" => \$opt_dir,
+ "dir=s" => \$opt_dir,
) or pod2usage(-exit => 1);
my $cmd = shift;
@@ -37,7 +37,7 @@
-w $opt_dir or die "$ME: write access to $opt_dir: $!\n";
_start(@ARGV) if $cmd eq "start";
- _kill(@ARGV) if $cmd eq "kill";
+ _kill(@ARGV) if $cmd eq "kill";
die "internal error\n";
}
@@ -46,21 +46,21 @@
defined(my $kvm = shift) or pod2usage;
my @config = slurp sprintf($CONFIG, $kvm), { chomp => 1 };
(shift @config) =~ /^#\s+kvm/
- or die "wrong file format („# kvm” expected)\n";
+ or die "wrong file format („# kvm” expected)\n";
if (not /^-pidfile/ ~~ @config) {
- push @config, sprintf "-pidfile $PIDFILE", $kvm;
+ push @config, sprintf "-pidfile $PIDFILE", $kvm;
}
if (not /^-name/ ~~ @config) {
- push @config, "-name $kvm";
- };
+ push @config, "-name $kvm";
+ }
return @config;
}
sub _kill(@) {
- my $kvm = shift;
+ my $kvm = shift;
my @config = get_config($kvm);
(/^-pidfile\s+(?<pidfile>.*)/ ~~ @config);
@@ -74,14 +74,14 @@
}
sub _start(@) {
- my $kvm = shift;
+ my $kvm = shift;
my @config = get_config($kvm);
defined(my $pid = fork) or die "Can't fork: $!\n";
if ($pid == 0) {
- exec $KVM "kvm-$KVM" => map { split } @config;
- die "Can't exec: $!";
+ exec $KVM "kvm-$KVM" => map { split } @config;
+ die "Can't exec: $!";
}
exit;