unify similar branch

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2020-04-25 16:54:20 +02:00
parent 6a883423ef
commit 420b0857de

10
DAB.pm
View File

@ -1569,16 +1569,10 @@ EOD
$self->run_command ($cmd);
}
if ($suite eq 'intrepid') {
# 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') {
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" if $suite eq 'intrepid';
$filelist .= " $rootdir/etc/sysctl.d/10-network-security.conf";
$self->run_command ("rm $filelist");
}