From d8f6c7268e00b808d9d59c0624aee83ab6f5aab0 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillomovitch@mageia.org>
Date: Thu, 8 Mar 2012 19:16:26 +0000
Subject: actually, we don't care about sysklogd at all anymore

---
 del-syslog | 36 +-----------------------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

(limited to 'del-syslog')

diff --git a/del-syslog b/del-syslog
index 456ffe0..c5c9725 100755
--- a/del-syslog
+++ b/del-syslog
@@ -14,41 +14,7 @@ EOF
     # don't do anything for upgrade
     exit(0) if $number == 1;
 
-    my $release_file = '/etc/release';
-    open(my $fh, '<', $release_file)
-        or die "can't open $release_file: $!";
-    my $line = <$fh>;
-    $line =~ /^Mageia release (\d\d\d\d\.\d)/;
-    my $release = $1;
-    close($fh);
-
-        del_rsyslog_entry($package);
-}
-
-sub del_sysklogd_entry {
-    my ($package) = @_;
-
-    my $file = "/etc/syslog.conf";
-
-    my $content;
-    open(my $in, '<', $file)
-        or die "Can't open $file for reading: $!";
-    while (my $line = <$in>) {
-        if ($line =~ /^# BEGIN: Automatically added by $package installation$/) {
-            while ($line = <$in>) {
-                last if $line =~ /^# END$/;
-            }
-        } else {
-            $content .= $line;
-        }
-    }
-
-    open(my $out, '>', $file)
-        or die "Can't open $file for writing: $!";
-    print $out $content;
-    close($out);
-
-    system('service syslog condrestart 2>&1 >/dev/null');
+    del_rsyslog_entry($package);
 }
 
 sub del_rsyslog_entry {
-- 
cgit v1.2.1