summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/vyatta-cfg-system.postinst.in14
1 files changed, 5 insertions, 9 deletions
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index daecb83f..8d288e75 100644
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -129,6 +129,11 @@ EOF
# Install pam_cap config
cp $sysconfdir/capability.conf /etc/security/capability.conf
+
+ # Install our own version of rsyslog.conf without
+ # default targets
+ mv /etc/rsyslog.conf /etc/rsyslog.conf.orig
+ cp $sysconfdir/rsyslog.conf /etc/rsyslog.conf
fi
# create needed directories
@@ -177,15 +182,6 @@ if [ -e /etc/default/mdadm ]; then
sed -i 's+^DAEMON_OPTIONS=.*$+DAEMON_OPTIONS="--syslog --program /opt/vyatta/sbin/vyatta-raid-event"+' /etc/default/mdadm
fi
-# --following is added to resolve issues related to bug 3567 on upgrade from hollywood to islavista--
-# back-up existing /etc/syslog.conf file in hollywood which might be broken
-# and replace it with the default syslog.conf in islavista. when system restarts
-# after upgrade, whatever is configured in CLI will be written to syslog.conf
-#
-
-cp -p /etc/syslog.conf /etc/syslog.conf.bak
-cp -f /opt/vyatta/etc/syslog.conf /etc/syslog.conf
-
# remove unnecessary ddclient script in /etc/ppp/ip-up.d/
# this logs unnecessary messages trying to start ddclient
rm -f /etc/ppp/ip-up.d/ddclient