mirror of
https://git.proxmox.com/git/dab
synced 2025-10-05 07:16:28 +00:00
some whitespace/indentation fixes
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
4d4e94fca6
commit
ba599cd091
15
DAB.pm
15
DAB.pm
@ -949,9 +949,9 @@ sub ve_command {
|
|||||||
|
|
||||||
if (ref ($cmd) eq 'ARRAY') {
|
if (ref ($cmd) eq 'ARRAY') {
|
||||||
unshift @$cmd, 'lxc-attach', '-n', $veid, '--rcfile', $conffile, '--clear-env', '--', 'defenv';
|
unshift @$cmd, 'lxc-attach', '-n', $veid, '--rcfile', $conffile, '--clear-env', '--', 'defenv';
|
||||||
$self->run_command ($cmd, $input);
|
$self->run_command($cmd, $input);
|
||||||
} else {
|
} else {
|
||||||
$self->run_command ("lxc-attach -n $veid --rcfile $conffile --clear-env -- defenv $cmd", $input);
|
$self->run_command("lxc-attach -n $veid --rcfile $conffile --clear-env -- defenv $cmd", $input);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1402,12 +1402,12 @@ sub bootstrap {
|
|||||||
}
|
}
|
||||||
|
|
||||||
my $closure = {};
|
my $closure = {};
|
||||||
$required = $self->closure ($closure, $required);
|
$required = $self->closure($closure, $required);
|
||||||
$important = $self->closure ($closure, $important);
|
$important = $self->closure($closure, $important);
|
||||||
|
|
||||||
if (!$opts->{minimal}) {
|
if (!$opts->{minimal}) {
|
||||||
push @$standard, 'xbase-clients';
|
push @$standard, 'xbase-clients';
|
||||||
$standard = $self->closure ($closure, $standard);
|
$standard = $self->closure($closure, $standard);
|
||||||
}
|
}
|
||||||
|
|
||||||
# test if we have all 'ubuntu-minimal' and 'ubuntu-standard' packages
|
# test if we have all 'ubuntu-minimal' and 'ubuntu-standard' packages
|
||||||
@ -1574,8 +1574,7 @@ EOD
|
|||||||
$self->ve_divert_add ("/sbin/udevd");
|
$self->ve_divert_add ("/sbin/udevd");
|
||||||
|
|
||||||
if ($suite eq 'etch') {
|
if ($suite eq 'etch') {
|
||||||
# disable apache2 startup
|
write_file ("NO_START=1\n", "$rootdir/etc/default/apache2"); # disable apache2 startup
|
||||||
write_file ("NO_START=1\n", "$rootdir/etc/default/apache2");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$self->logmsg ("configure required packages\n");
|
$self->logmsg ("configure required packages\n");
|
||||||
@ -1757,7 +1756,7 @@ sub compute_required {
|
|||||||
my $instpkgs = $self->read_installed ();
|
my $instpkgs = $self->read_installed ();
|
||||||
|
|
||||||
my $closure = {};
|
my $closure = {};
|
||||||
__record_provides ($pkginfo, $closure, [keys %$instpkgs]);
|
__record_provides($pkginfo, $closure, [keys $instpkgs->%*]);
|
||||||
|
|
||||||
return $self->closure ($closure, $pkglist);
|
return $self->closure ($closure, $pkglist);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user