From 420b0857de1456cc3e64dc2dbff0b580010cb6ce Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Sat, 25 Apr 2020 16:54:20 +0200 Subject: [PATCH] unify similar branch Signed-off-by: Thomas Lamprecht --- DAB.pm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/DAB.pm b/DAB.pm index 1ae3e4c..c8b650a 100644 --- a/DAB.pm +++ b/DAB.pm @@ -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"); } -- 2.39.2