[Pkg-samba-maint] [samba] 01/01: add symlink for old location of tdb files

[Ivo De Decker]

This is an automated email from the git hooks/post-receive script.

idd-guest pushed a commit to branch master
in repository samba.

commit 87b2c585212c822e454a568a6aabeab95a0fe4f5
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Fri Nov 1 17:14:32 2013 +0100

    add symlink for old location of tdb files
---
 debian/samba-libs.preinst |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/samba-libs.preinst b/debian/samba-libs.preinst
index 3466d94..68b8d5d 100644
--- a/debian/samba-libs.preinst
+++ b/debian/samba-libs.preinst
@@ -11,7 +11,8 @@ then
 	do
 		if [ -e /var/lib/samba/$file ]
 		then
-			if [ -e /var/lib/samba/private/$file ]
+			if [ -e /var/lib/samba/private/$file ] &&
+				[ ! /var/lib/samba/$file -ef /var/lib/samba/private/$file ]
 			then
 				echo $file exists in /var/lib/samba and /var/lib/samba/private, aborting samba-libs preinst
 				echo rename one of them to allow the install/upgrade to continue
@@ -32,6 +33,7 @@ then
 					mkdir /var/lib/samba/private
 				fi
 				mv /var/lib/samba/$file /var/lib/samba/private/$file
+				ln -s /var/lib/samba/private/$file /var/lib/samba/$file
 			fi
 		fi
 	done

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git