From cd50870a09e7591b461b533f37c5d43f4315ce97 Mon Sep 17 00:00:00 2001
From: dsomero <xgizzmo@slackbuilds.org>
Date: Wed, 23 Mar 2011 18:21:19 -0400
Subject: system/drbd-tools: Handle .new files correctly.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 system/drbd-tools/doinst.sh | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'system/drbd-tools/doinst.sh')

diff --git a/system/drbd-tools/doinst.sh b/system/drbd-tools/doinst.sh
index 5963b24bb250..dd9569973fcd 100644
--- a/system/drbd-tools/doinst.sh
+++ b/system/drbd-tools/doinst.sh
@@ -11,13 +11,18 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-# Keep same perms on rc.drbd.new:
-if [ -e etc/rc.d/rc.drbd ]; then
-  cp -a etc/rc.d/rc.drbd etc/rc.d/rc.drbd.new.incoming
-  cat etc/rc.d/rc.drbd.new > etc/rc.d/rc.drbd.new.incoming
-  mv etc/rc.d/rc.drbd.new.incoming etc/rc.d/rc.drbd.new
-fi
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.drbd.new
+preserve_perms etc/drbd.conf.new
+preserve_perms etc/drbd.d/global_common.conf.new
 
-config etc/rc.d/rc.drbd.new
-config etc/drbd.conf.new
-config etc/drbd.d/global_common.conf.new
-- 
cgit v1.2.3