projects
/
gruntmaster-daemon.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not depend on bash logout and pass -n to poweroff (9p is sync,dirsync)
[gruntmaster-daemon.git]
/
lib
/
Gruntmaster
/
Daemon
/
Format.pm
diff --git
a/lib/Gruntmaster/Daemon/Format.pm
b/lib/Gruntmaster/Daemon/Format.pm
index bcfb2a4ebfe0a48db0adefe1bf3ef4583ea3db8f..a492e63c80ecc9bd06b8c389495dd05325b6cdb7 100644
(file)
--- a/
lib/Gruntmaster/Daemon/Format.pm
+++ b/
lib/Gruntmaster/Daemon/Format.pm
@@
-11,7
+11,6
@@
use File::Basename qw/fileparse/;
use File::Slurp qw/read_file write_file/;
use List::MoreUtils qw/natatime/;
use Log::Log4perl qw/get_logger/;
use File::Slurp qw/read_file write_file/;
use List::MoreUtils qw/natatime/;
use Log::Log4perl qw/get_logger/;
-use POSIX qw/mkfifo/;
use String::ShellQuote qw/shell_quote/;
use Try::Tiny;
use String::ShellQuote qw/shell_quote/;
use Try::Tiny;
@@
-23,15
+22,15
@@
our @EXPORT_OK = qw/prepare_files stopvms/;
our (%vm);
sub runvm {
our (%vm);
sub runvm {
- my ($name) = @_;
+ my ($name
, $arg
) = @_;
return unless $ENV{GRUNTMASTER_VM};
return unless $ENV{GRUNTMASTER_VM};
- m
kfifo "$name.in", 0600
;
-
mkfifo "$name.out", 0600
;
- get_logger->trace("Starting VM $name");
+ m
y $cmd = $ENV{GRUNTMASTER_VM}
;
+
$cmd .= ' ' . $arg if $arg
;
+ get_logger->trace("Starting VM $name
($cmd)
");
$vm{$name} = Expect::Simple->new({
$vm{$name} = Expect::Simple->new({
- Cmd =>
"$ENV{GRUNTMASTER_VM} $name"
,
+ Cmd =>
$cmd
,
Prompt => '# ',
Prompt => '# ',
- DisconnectCmd => '
exit
',
+ DisconnectCmd => '
/sbin/poweroff -fn
',
RawPty => 1,
Timeout => 10,
});
RawPty => 1,
Timeout => 10,
});
@@
-104,7
+103,12
@@
sub prepare{
sub prepare_files{
my $meta = shift;
sub prepare_files{
my $meta = shift;
- runvm $_ for keys %{$meta->{files}};
+ if ($meta->{runner} eq 'Interactive') {
+ runvm ver => '-serial unix:vm.sock,nowait,server';
+ runvm prog => '-serial unix:vm.sock,nowait';
+ } else {
+ runvm $_ for keys %{$meta->{files}};
+ }
for my $file (values %{$meta->{files}}) {
my ($format, $name, $content) = @{$file}{qw/format name content/};
for my $file (values %{$meta->{files}}) {
my ($format, $name, $content) = @{$file}{qw/format name content/};
This page took
0.010777 seconds
and
4
git commands to generate.