X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=56dbbd2963394f39debac780f6cd1575b361fcce;hb=fbc20c5c8e1bd1088fdb3fb5cd2cb074f4807346;hp=d7137cd3bb30c73ece5b6bb65693ab3c7ce11c85;hpb=76c08dc8ca3900264c1c8dcbbe26f169223d6cc2;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index d7137cd..56dbbd2 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
@@ -30,6 +31,14 @@ else
     verbose=-v
 fi
 
+tempdir=''
+
+cleanup ()
+{
+  rm -f lock
+  rm -rf $tempdir
+}
+
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 export PATH
 HOST=`hostname -f`
@@ -38,7 +47,7 @@ LOCALSYNCON=`ud-config localsyncon`;
 cd /tmp/
 cd /var/lib/misc || cd /var/state/glibc/ || cd /var/db/
 lockfile -r 1 -l 3600 lock
-trap "rm -f lock" exit
+trap cleanup exit
 
 case $HOST in
 $LOCALSYNCON)
@@ -68,11 +77,20 @@ done
 ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh
 ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
 
+if [ -e ${HOST}/ssh-keys.tar.gz ]; then
+  export TMPDIR='/tmp/'
+  tempdir=$(mktemp -d)
+  (cd $tempdir && tar -xf ${old}/${HOST}/ssh-keys.tar.gz)
+  ! [ -d userkeys ] || mkdir userkeys
+  chmod 755 $tempdir
+  rsync -a --delete-after $tempdir/ userkeys/
+fi
+
+CHROOTS=""
 if [ -x /usr/bin/dchroot ]; then
 	CHROOTS=`dchroot --listpaths`
-fi
-if [ -x /usr/bin/dchroot-dsa ]; then
-        CHROOTS=$(dchroot-dsa -i | grep Location | awk '{print $2}')
+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