Commit d485ef4e authored by Francesc Guasch's avatar Francesc Guasch
Browse files

Merge branch 'develop' of github.com:UPC/ravada into develop

parents d21701f8 47cfc7cb
......@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: 0.1.0-alpha\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-01-03 10:12+0300\n"
"PO-Revision-Date: 2020-11-14 14:28+0000\n"
"Last-Translator: Gloria Rodriguez <gloria.rodriguez@upc.edu>\n"
"PO-Revision-Date: 2021-06-24 14:35+0000\n"
"Last-Translator: Xean <xeanhort007@gmail.com>\n"
"Language-Team: Catalan <https://hosted.weblate.org/projects/ravada/"
"translation/ca/>\n"
"Language: ca\n"
......@@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.4-dev\n"
"X-Generator: Weblate 4.7.1-dev\n"
msgid "Ravada broker"
msgstr "Broker Ravada"
......@@ -966,3 +966,9 @@ msgstr "Visualització"
msgid "Max Memory"
msgstr "Memòria Màx"
msgid "Waiting for network to come up"
msgstr "Esperant que surti la xarxa"
msgid "Press SHIFT + F12 to exit"
msgstr "Premeu SHIFT + F12 per sortir"
......@@ -385,7 +385,6 @@ sub _around_create_domain {
my $id_owner = delete $args{id_owner} or confess "ERROR: Missing id_owner";
my $owner = Ravada::Auth::SQL->search_by_id($id_owner) or confess "Unknown user id: $id_owner";
my $base;
my $volatile = delete $args{volatile};
my $id_base = delete $args{id_base};
......@@ -411,7 +410,7 @@ sub _around_create_domain {
$vm_local = $self->new( host => 'localhost') if !$vm_local->is_local;
$base = $vm_local->search_domain_by_id($id_base)
or confess "Error: I can't find domain $id_base on ".$self->name;
$volatile = 1 if $base->volatile_clones;
$volatile = $base->volatile_clones if (! defined($volatile));
if ($add_to_pool) {
confess "Error: you can't add to pool and also pick from pool" if $from_pool;
$from_pool = 0;
......@@ -475,7 +474,7 @@ sub _around_create_domain {
}
}
my $user = Ravada::Auth::SQL->search_by_id($id_owner);
$domain->is_volatile(1) if $user->is_temporary() ||($base && $base->volatile_clones()) || $volatile;
$domain->is_volatile(1) if $user->is_temporary() || $volatile;
my @start_args = ( user => $owner );
push @start_args, (remote_ip => $remote_ip) if $remote_ip;
......
......@@ -370,7 +370,7 @@ sub test_ips {
my @ips;
for my $line (split /\n/, $out) {
my ($if, $ip) = $line =~ /\s(\w+)\s+inet\s+(\d+\.\d+\.\d+\.\d+)/;
push @ips ,($ip) if $if !~ /^virbr/;
push @ips ,($ip) if (($if) && ($if !~ /^virbr/));
}
for my $ip (@ips) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment