r2017 - vdr/vdradmin/trunk/debian

[Thomas Schmidt]

Author: tschmidt
Date: 2006-03-13 20:52:06 +0000 (Mon, 13 Mar 2006)
New Revision: 2017

Modified:
   vdr/vdradmin/trunk/debian/postinst
   vdr/vdradmin/trunk/debian/postrm
   vdr/vdradmin/trunk/debian/vdradmin-am.dirs
Log:
vdradmin: link cfg-file to /etc/vdradmin-am instead of /etc/vdradminwq

Modified: vdr/vdradmin/trunk/debian/postinst
===================================================================
--- vdr/vdradmin/trunk/debian/postinst	2006-03-13 20:04:07 UTC (rev 2016)
+++ vdr/vdradmin/trunk/debian/postinst	2006-03-13 20:52:06 UTC (rev 2017)
@@ -11,9 +11,14 @@
   fi
 fi
 
-[ -e /etc/vdradmin/vdradmind.conf ] || ln -s /var/lib/vdradmin-am/vdradmind.conf \
-/etc/vdradmin/vdradmind.conf
+if [ -L /etc/vdradmin/vdradmind.conf ]; then
+   rm -f /etc/vdradmin/vdradmind.conf
+fi
 
+if [ ! -e /etc/vdradmin-am/vdradmind.conf ]; then
+        ln -s /var/lib/vdradmin-am/vdradmind.conf /etc/vdradmin-am/vdradmind.conf
+fi
+
 if [ ! -f /var/lib/vdradmin-am/vdradmind.at ]; then
    if [ -f /var/lib/vdradmin/vdradmind.at ]; then 
       mv /var/lib/vdradmin/vdradmind.at /var/lib/vdradmin-am/

Modified: vdr/vdradmin/trunk/debian/postrm
===================================================================
--- vdr/vdradmin/trunk/debian/postrm	2006-03-13 20:04:07 UTC (rev 2016)
+++ vdr/vdradmin/trunk/debian/postrm	2006-03-13 20:52:06 UTC (rev 2017)
@@ -6,7 +6,7 @@
  	rm -f /var/lib/vdradmin-am/vdradmind.conf > /dev/null 2>&1 || true
  	rm -f /var/lib/vdradmin-am/vdradmind.at > /dev/null 2>&1 || true
  	rm -f /var/lib/vdradmin-am/vdradmind.done > /dev/null 2>&1 || true
- 	rm -f /etc/vdradmin/vdradmind.conf > /dev/null 2>&1 || true
+ 	rm -f /etc/vdradmin-am/vdradmind.conf > /dev/null 2>&1 || true
 
     	chown root:root /var/log/vdradmind.log > /dev/null 2>&1 || true
 	

Modified: vdr/vdradmin/trunk/debian/vdradmin-am.dirs
===================================================================
--- vdr/vdradmin/trunk/debian/vdradmin-am.dirs	2006-03-13 20:04:07 UTC (rev 2016)
+++ vdr/vdradmin/trunk/debian/vdradmin-am.dirs	2006-03-13 20:52:06 UTC (rev 2017)
@@ -1,2 +1,2 @@
 var/lib/vdradmin-am
-etc/vdradmin
+etc/vdradmin-am