X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=0b936d5baa3a44b8c3366bf7667cba92f5e997f5;hb=295c5a42b122c69116d967e50822f383fcbe2c02;hp=2f7c3ec1968af71ff95f2c88906a2c71af6b1ca0;hpb=0cf89e0a824ef106270e2581f4994d6c693c35af;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index 2f7c3ec..0b936d5 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -1,8 +1,8 @@
 #! /bin/sh
 
-#   Copyright (c) 1999-2001  Jason Gunthorpe <jgg@infodrom.org>
-#   Copyright (c) 2002-2003  Ryan Murray <rmurray@infodrom.org>
-#   Copyright (c) 2004  Joey Schulze <joey@infodrom.org>
+#   Copyright (c) 1999-2001  Jason Gunthorpe <jgg@debian.org>
+#   Copyright (c) 2002-2003  Ryan Murray <rmurray@debian.org>
+#   Copyright (c) 2004-2005  Joey Schulze <joey@infodrom.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
@@ -21,7 +21,7 @@
 set -e
 
 # Without effect on the commandline
-if [ -z "$PS1" -o "$TERM" = "dumb" ]
+if [ -z "$TERM" -o "$TERM" = "dumb" ]
 then
     exec > /dev/null 2>&1
 else
@@ -60,12 +60,15 @@ ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
 if [ -x /usr/bin/dchroot ]; then
 	CHROOTS=`dchroot --listpaths`
 	for c in $CHROOTS; do
-		test ! -d "$c/var/lib/misc/HOST" || mkdir -p "$c/var/lib/misc/HOST"
+		if [ -x "$c/usr/bin/makedb" ]
+		then
 
-		rsync -a ${verbose} $HOST/group.tdb $HOST/passwd.tdb $HOST/ssh* "$c/var/lib/misc/$HOST"
+			test ! -d "$c/var/lib/misc/$HOST" || mkdir -p "$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"
+			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"
 
 			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
@@ -73,6 +76,7 @@ if [ -x /usr/bin/dchroot ]; then
 			mv -f "$c/var/lib/misc/group.db.t" "$c/var/lib/misc/group.db"
 			ln -sf "$c/var/lib/misc/$HOST/ssh_known_hosts" "$c/var/lib/misc/"
 			ln -sf ../../var/lib/misc/ssh_known_hosts "$c/etc/ssh"
+		fi
 	done
 fi