Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2015-02-11 13:14:59 -04:00
commit 07eec0b396
2 changed files with 10 additions and 14 deletions

View file

@ -1,14 +0,0 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4"
nickname="Markus"
subject="comment 2"
date="2015-02-11T11:16:37Z"
content="""
It's a DS414 Synology NAS. I followed this tutorial:
http://git-annex.branchable.com/tips/Synology_NAS_and_git_annex/ and I've run runshell to create those two scripts inside the .ssh folder.
I'm using the pubkey authentication with separate keys (just as described). Thus git-annex-shell in the .ssh script is run, when git-annex on my laptop tries to connect by ssh.
This is the cmdline argument of the process that eats up all memory without finishing:
/volume1/homes/admin/git-annex.linux//lib/ld-linux.so.3--library-path/volume1/homes/admin/git-annex.linux//etc/ld.so.conf.d:/volume1/homes/admin/git-annex.linux//usr/lib/arm-linux-gnueabi/audit:/volume1/homes/admin/git-annex.linux//usr/lib/arm-linux-gnueabi/gconv:/volume1/homes/admin/git-annex.linux//usr/lib:/volume1/homes/admin/git-annex.linux//usr/lib/arm-linux-gnueabi:/volume1/homes/admin/git-annex.linux//lib:/volume1/homes/admin/git-annex.linux//lib/arm-linux-gnueabi:/volume1/homes/admin/git-annex.linux/shimmed/git-annex-shell/git-annex-shell-cgit-annex-shell 'configlist' '/volume1/homes/admin/GitAnnex'
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4"
nickname="Markus"
subject="comment 3"
date="2015-02-11T16:22:58Z"
content="""
git-annex-shell-cgit-annex-shell doesn't even exist in git-annex-shell
when I run runshell directly being logged in per ssh, it's the same command but sh/sh is run instead of git-annex-shell/git-annex-shell-cgit-annex-shell but I don't know how the shell to be run is selected
"""]]