Fix the --auth-key flag in gentoo template

Fix a typo in the getopt call, should be auth-key not auth_key. Also provide the argument to cat, so the script doesn't hang waiting on stdin. Closes #379 Signed-off-by: Erik Mackdanz <erikmack@gmail.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

Fix the --auth-key flag in gentoo template
45c2cdd1 · Erik Mackdanz · Stéphane Graber · 8188aae1 · 45c2cdd1
Commit 45c2cdd1 authored Mar 12, 2015 by Erik Mackdanz Committed by Stéphane Graber Aug 14, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

lxc-gentoo.in templates/lxc-gentoo.in +3 -3

No files found.
--- a/templates/lxc-gentoo.in
+++ b/templates/lxc-gentoo.in
@@ -641,11 +641,11 @@ container_auth()
    if [[ -r "${auth_key}" ]]; then
        printf " deploying auth_key %s for user %s ...\n" "${auth_key}" "${user}"
        mkdir -p "${rootfs}/${auth_home}/.ssh"
-        cat >> "${rootfs}/${auth_home}/.ssh/authorized_keys"
+        cat "${auth_key}" >> "${rootfs}/${auth_home}/.ssh/authorized_keys"
        chroot "${rootfs}" chown "${user}:" "${auth_home}/.ssh/authorized_keys"
        printf "  => inserted public key in %s/.ssh/authorized_keys\n" "${auth_home}"
        [[ -z "${forced_password}" ]] && unset password
-        store_user_message "${user} has the ssh key you gived us"
+        store_user_message "${user} has the ssh key you gave us"
    fi
    if [[ -n "${password}" ]]; then
@@ -782,7 +782,7 @@ user="root"
 password="toor"
 tty=1
 settings="common"
-options=$(getopt -o hp:n:a:FcPv:t:S:u:w:s:m: -l help,rootfs:,path:,name:,arch:,flush-cache,cache-only,private-portage,variant:,portage-dir:,tarball:,auth_key:,user:,autologin,password:,settings:,mirror:,tty: -- "$@")
+options=$(getopt -o hp:n:a:FcPv:t:S:u:w:s:m: -l help,rootfs:,path:,name:,arch:,flush-cache,cache-only,private-portage,variant:,portage-dir:,tarball:,auth-key:,user:,autologin,password:,settings:,mirror:,tty: -- "$@")
 eval set -- "$options"