From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Sat, 25 Apr 2020 14:54:20 +0000 (+0200)
Subject: unify similar branch
X-Git-Url: https://git.proxmox.com/?p=dab.git;a=commitdiff_plain;h=420b0857de1456cc3e64dc2dbff0b580010cb6ce

unify similar branch

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---

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");
     }