projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ud-generate: handle individual ssh keys
[mirror/userdir-ldap.git]
/
ud-replicate
diff --git
a/ud-replicate
b/ud-replicate
index
655b263
..
2e99d75
100755
(executable)
--- a/
ud-replicate
+++ b/
ud-replicate
@@
-30,6
+30,14
@@
else
verbose=-v
fi
verbose=-v
fi
+tempdir=''
+
+cleanup ()
+{
+ rm -f lock
+ rm -rf $tempdir
+}
+
PATH=/sbin:/usr/sbin:/bin:/usr/bin
export PATH
HOST=`hostname -f`
PATH=/sbin:/usr/sbin:/bin:/usr/bin
export PATH
HOST=`hostname -f`
@@
-38,7
+46,7
@@
LOCALSYNCON=`ud-config localsyncon`;
cd /tmp/
cd /var/lib/misc || cd /var/state/glibc/ || cd /var/db/
lockfile -r 1 -l 3600 lock
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)
case $HOST in
$LOCALSYNCON)
@@
-68,6
+76,15
@@
done
ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh
ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
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
+ export TMPDIR='/tmp/'
+ tempdir=$(mktemp -d)
+ old=$(pwd -P)
+ cd $tempdir && tar -xvf $old/ssh-keys.tar.gz
+ mkdir userkeys 2> /dev/null || true
+ rsync -av --delete-after $tempdir/ userkeys/
+fi
+
if [ -x /usr/bin/dchroot ]; then
CHROOTS=`dchroot --listpaths`
for c in $CHROOTS; do
if [ -x /usr/bin/dchroot ]; then
CHROOTS=`dchroot --listpaths`
for c in $CHROOTS; do