From b63a0f19679e0e09408a568922d267952a19c36e Mon Sep 17 00:00:00 2001
From: Robby Workman <rw@rlworkman.net>
Date: Tue, 11 May 2010 19:46:43 +0200
Subject: system/ulogd: Updated for version 1.24

---
 system/ulogd/doinst.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'system/ulogd/doinst.sh')

diff --git a/system/ulogd/doinst.sh b/system/ulogd/doinst.sh
index cecac19279..31fe42432e 100644
--- a/system/ulogd/doinst.sh
+++ b/system/ulogd/doinst.sh
@@ -1,17 +1,24 @@
 config() {
   NEW="$1"
-  OLD="`dirname $NEW`/`basename $NEW .new`"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
   # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
-  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
     # toss the redundant copy
     rm $NEW
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
+# Keep same perms on rc.ulogd.new:
+if [ -e etc/rc.d/rc.ulogd ]; then
+  cp -a etc/rc.d/rc.ulogd etc/rc.d/rc.ulogd.new.incoming
+  cat etc/rc.d/rc.ulogd.new > etc/rc.d/rc.ulogd.new.incoming
+  mv etc/rc.d/rc.ulogd.new.incoming etc/rc.d/rc.ulogd.new
+fi
+
 config etc/ulogd.conf.new
+config etc/logrotate.d/ulogd.new
 config etc/rc.d/rc.ulogd.new
-config etc/logrotate.d/ulogd.logrotate.new
 
-- 
cgit v1.2.3