X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=f148bf6096a4127b35a5d979d53d8aa98ab2f9c7;hb=432f864af2347050e3dce2ff7002f04176468206;hp=2e99d7555e1554fd794fd8e2d7220887971088c3;hpb=1d3b3d39d8d9ff64df9b9569e0dc742f98a64147;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index 2e99d75..f148bf6 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -4,6 +4,7 @@
 #   Copyright (c) 2002-2003,2006  Ryan Murray <rmurray@debian.org>
 #   Copyright (c) 2004-2005  Joey Schulze <joey@infodrom.org>
 #   Copyright (c) 2008 Peter Palfrader <peter@palfrader.org>
+#   Copyright (c) 2008 Stephen Gran <sgran@debian.org>
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -76,17 +77,24 @@ done
 ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh
 ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
 
-if [ -e ssh-keys.tar.gz ]; then
+if [ -e ${HOST}/ssh-keys.tar.gz ]; then
   export TMPDIR='/tmp/' 
   tempdir=$(mktemp -d)
   old=$(pwd -P)
-  cd $tempdir && tar -xvf $old/ssh-keys.tar.gz
+  cd $tempdir && tar -xf ${old}/${HOST}/ssh-keys.tar.gz
+  cd $old
   mkdir userkeys 2> /dev/null || true
-  rsync -av --delete-after $tempdir/ userkeys/
+  chmod 755 $tempdir
+  rsync -a --delete-after $tempdir/ userkeys/
 fi
 
+CHROOTS=""
 if [ -x /usr/bin/dchroot ]; then
 	CHROOTS=`dchroot --listpaths`
+elif [ -x /usr/bin/dchroot-dsa ]; then
+	CHROOTS=$(dchroot-dsa -i | grep Location | awk '{print $2}')
+fi
+if [ -n "$CHROOTS" ]; then
 	for c in $CHROOTS; do
 		if [ -x "$c/usr/bin/makedb" ]
 		then