You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
16 lines
689 B
16 lines
689 B
7 years ago
|
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
|
||
|
index 8e1091c..4bba5d6 100644
|
||
|
--- a/contrib/ssh-copy-id
|
||
|
+++ b/contrib/ssh-copy-id
|
||
|
@@ -274,9 +274,7 @@ case "$REMOTE_VERSION" in
|
||
|
populate_new_ids 0
|
||
|
fi
|
||
|
[ "$DRY_RUN" ] || printf '%s\n' "$NEW_IDS" | ssh "$@" "
|
||
|
- umask 077 ;
|
||
|
+ exec sh -c 'umask 077; mkdir -p .ssh && cat >> .ssh/authorized_keys || exit 1; if type restorecon >/dev/null 2>&1; then restorecon -F .ssh .ssh/authorized_keys; fi'" \
|
||
|
- mkdir -p .ssh && cat >> .ssh/authorized_keys || exit 1 ;
|
||
|
- if type restorecon >/dev/null 2>&1 ; then restorecon -F .ssh .ssh/authorized_keys ; fi" \
|
||
|
|| exit 1
|
||
|
ADDED=$(printf '%s\n' "$NEW_IDS" | wc -l)
|
||
|
;;
|