Commit 07783cde authored by Iustin Pop's avatar Iustin Pop

Merge branch 'devel-2.1'

* devel-2.1:
  Fix path in ganeti-rapi man page
  Adjust message in case ~/.ssh is no directory
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parents 46d2d8a2 215e40a9
......@@ -56,7 +56,7 @@ def GetUserFiles(user, mkdir=False):
if mkdir:
utils.EnsureDirs([(ssh_dir, constants.SECURE_DIR_MODE)])
elif not os.path.isdir(ssh_dir):
raise errors.OpExecError("path ~%s/.ssh is not a directory" % user)
raise errors.OpExecError("Path %s is not a directory" % ssh_dir)
return [utils.PathJoin(ssh_dir, base)
for base in ["id_dsa", "id_dsa.pub", "authorized_keys"]]
......
......@@ -94,7 +94,7 @@
<para>
The users and their rights are defined in a file named
<filename>rapi_users</filename>, located in the <filename
class="directory">@LOCALSTATEDIR@/ganeti</filename>
class="directory">@LOCALSTATEDIR@/lib/ganeti</filename>
directory. The users should be listed one per line, in the
following format:
</para>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment