mirror of
https://git.proxmox.com/git/dab
synced 2025-10-04 15:49:30 +00:00
unify similar branch
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
6a883423ef
commit
420b0857de
10
DAB.pm
10
DAB.pm
@ -1569,16 +1569,10 @@ EOD
|
|||||||
$self->run_command ($cmd);
|
$self->run_command ($cmd);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($suite eq 'intrepid') {
|
if ($suite eq 'intrepid' || $suite eq 'jaunty') {
|
||||||
# remove sysctl setup (avoid warnings at startup)
|
|
||||||
my $filelist = "$rootdir/etc/sysctl.d/10-console-messages.conf";
|
|
||||||
$filelist .= " $rootdir/etc/sysctl.d/10-process-security.conf";
|
|
||||||
$filelist .= " $rootdir/etc/sysctl.d/10-network-security.conf";
|
|
||||||
$self->run_command ("rm $filelist");
|
|
||||||
}
|
|
||||||
if ($suite eq 'jaunty') {
|
|
||||||
# remove sysctl setup (avoid warnings at startup)
|
# remove sysctl setup (avoid warnings at startup)
|
||||||
my $filelist = "$rootdir/etc/sysctl.d/10-console-messages.conf";
|
my $filelist = "$rootdir/etc/sysctl.d/10-console-messages.conf";
|
||||||
|
$filelist .= " $rootdir/etc/sysctl.d/10-process-security.conf" if $suite eq 'intrepid';
|
||||||
$filelist .= " $rootdir/etc/sysctl.d/10-network-security.conf";
|
$filelist .= " $rootdir/etc/sysctl.d/10-network-security.conf";
|
||||||
$self->run_command ("rm $filelist");
|
$self->run_command ("rm $filelist");
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user