X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=7228815ec9e8d346bd481c1ef12f5fd7ed0530b9;hb=b57e8dd08a1e9ae2243179519b2080d571d31f3c;hp=fd858a2fea5fe3b729a87b207db6068cf630aa1f;hpb=b20f306204cc909d64343dad7516560da829c84f;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index fd858a2..7228815 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -72,10 +72,13 @@ fi
 makedb "$HOST/group.tdb" -o group.db.t
 mv -f passwd.db.t passwd.db
 mv -f group.db.t group.db
-for a in $HOST/ssh-rsa-shadow $HOST/ssh_known_hosts; do
-	ln -sf $a .
-done
-ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh
+if [ -e "$HOST/ssh-rsa-shadow" ]; then
+	ln -sf $HOST/ssh-rsa-shadow .
+	ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh
+else
+	rm -f ssh-rsa-shadow /etc/ssh/ssh-rsa-shadow
+fi
+ln -sf $HOST/ssh_known_hosts .
 ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
 
 if [ -e ${HOST}/ssh-keys.tar.gz ]; then
@@ -95,22 +98,41 @@ elif [ -x /usr/bin/dchroot-dsa ]; then
 fi
 if [ -n "$CHROOTS" ]; then
 	for c in $CHROOTS; do
+		if [ "$c" = "/" ] || [ "$c" = "" ]; then
+			echo "$0 WTF: \$c is '' or '/' here." 2>&1
+			exit 1
+		fi
 		if [ -x "$c/usr/bin/makedb" ]
 		then
-
-			test ! -d "$c/var/lib/misc/$HOST" || mkdir -p "$c/var/lib/misc/$HOST"
-
-			rsync -a ${verbose} $HOST/group.tdb $HOST/passwd.tdb $HOST/ssh* "$c/var/lib/misc/$HOST"
-
-			test ! -f "$c/var/lib/misc/$HOST/shadow.tdb" || rm -f "$c/var/lib/misc/$HOST/shadow.tdb"
-			test ! -f "$c/var/lib/misc/shadow.db" || rm -f "$c/var/lib/misc/shadow.db"
-
+			mkdir -p "$c/var/lib/misc/$HOST"
+
+			# remove extra stuff from earlier times and so
+			find "$c/var/lib/misc/$HOST" -mindepth 1 \
+				! -name group.tdb -a \
+				! -name passwd.tdb -a \
+				! -name ssh_known_hosts \
+				-print0 | xargs --no-run-if-empty -0 rm -f
+			rsync -a ${verbose} $HOST/group.tdb $HOST/passwd.tdb $HOST/ssh_known_hosts "$c/var/lib/misc/$HOST"
+
+			# clean up from the times we supposedly did shadow stuff in chroots
+			rm -f "$c/var/lib/misc/shadow.db"
+
+			# from failed makedb runs earlier.
+			rm -f "$c/var/lib/misc/passwd.db.t" \
+			      "$c/var/lib/misc/group.db.t"
+			# build passwd information
 			chroot "$c" makedb "/var/lib/misc/$HOST/passwd.tdb" -o /var/lib/misc/passwd.db.t
 			chroot "$c" makedb "/var/lib/misc/$HOST/group.tdb" -o /var/lib/misc/group.db.t
 			mv -f "$c/var/lib/misc/passwd.db.t" "$c/var/lib/misc/passwd.db"
 			mv -f "$c/var/lib/misc/group.db.t" "$c/var/lib/misc/group.db"
+
 			ln -sf "$HOST/ssh_known_hosts" "$c/var/lib/misc/"
-			ln -sf ../../var/lib/misc/ssh_known_hosts "$c/etc/ssh"
+			if [ -d "$c/etc/ssh" ]; then
+				ln -sf ../../var/lib/misc/ssh_known_hosts "$c/etc/ssh"
+			elif [ -L "$c/etc/ssh" ] && [ "`readlink \"$c/etc/ssh\"`" = "../../var/lib/misc/ssh_known_hosts" ]; then
+				# clean up past mistakes
+				rm -f "$c/etc/ssh"
+			fi
 		fi
 	done
 fi