-
- 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