unify similar branch

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

diff --git a/DAB.pm b/DAB.pm
index 1ae3e4c056b749faa02bf065348536053482d8d4..c8b650a7317d7f679e04791485006ec949600cd3 100644 (file)
--- 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");
     }