[PATCH 4/4 branch usrmove] Add ssh client module code

[PATCH 4/4 branch usrmove] Add ssh client module code

[Dave Young]

Add ssh-client module, which support ssh key mode and interactive mode.
with --sshkey option you can provide the ssh key to be installed

Usage:
1. sshkey mode:
transfer your public key to remote machine with ssh-copy-id or do it mannaully
example of options:
./dracut -l -H -a ssh-client --sshkey /root/.ssh/id_rsa i.img
2. interactive mode:
need use --ctty option, ie.:
./dracut -l -H -a ssh-client --ctty i.img
---
 dracut                                 |    3 +-
 dracut.8.xml                           |    8 ++++
 modules.d/95ssh-client/module-setup.sh |   61 ++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 1 deletions(-)
 create mode 100644 modules.d/95ssh-client/module-setup.sh

diff --git a/dracut b/dracut
index 24a89e6..c10c0bb 100755
--- a/dracut
+++ b/dracut
@@ -233,6 +233,7 @@ while (($# > 0)); do
         --debug)       debug="yes";;
         --profile)     profile="yes";;
         --ctty)        cttyhack="yes";;
+        --sshkey)      read_arg sshkey   "$@" || shift;;
         -v|--verbose)  ((verbosity_mod_l++));;
         -q|--quiet)    ((verbosity_mod_l--));;
         -l|--local)    allowlocal="yes" ;;
@@ -590,7 +591,7 @@ export initdir dracutbasedir dracutmodules drivers \
     add_drivers mdadmconf lvmconf filesystems \
     use_fstab libdir usrlibdir fscks nofscks cttyhack \
     stdloglvl sysloglvl fileloglvl kmsgloglvl logfile \
-    debug host_fs_types host_devs
+    debug host_fs_types host_devs sshkey
 
 # Create some directory structure first
 [[ $prefix ]] && mkdir -m 0755 -p "${initdir}${prefix}"
diff --git a/dracut.8.xml b/dracut.8.xml
index a46fc04..a88fe16 100644
--- a/dracut.8.xml
+++ b/dracut.8.xml
@@ -370,6 +370,14 @@ Default:
         </varlistentry>
         <varlistentry>
           <term>
+            <option>--sshkey&nbsp;<replaceable>&lt;sshkey file&gt;</replaceable></option>
+          </term>
+          <listitem>
+            <para>ssh key file used with ssh-client module.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
             <option>-l</option>
           </term>
           <term>
diff --git a/modules.d/95ssh-client/module-setup.sh b/modules.d/95ssh-client/module-setup.sh
new file mode 100644
index 0000000..3e72cce
--- /dev/null
+++ b/modules.d/95ssh-client/module-setup.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+# how to tell the param SSH_KEY_LOCATION?
+# fixme: assume user is root
+
+check() {
+    # If our prerequisites are not met, fail.
+    type -P ssh >/dev/null || return 1
+    type -P scp >/dev/null || return 1
+    if [[ $sshkey ]]; then
+        [ ! -f $sshkey ] && {
+            derror "sshkey is not found!"
+            return 1
+        }
+        [[ ! $cttyhack = yes ]] && {
+            dinfo "--ctty is not used, you should make sure the machine is knowhost and copy the sshkey to remote machine!"
+        }
+    else
+        [[ ! $cttyhack = yes ]] && {
+            derror "ssh interactive mode need option --ctty!"
+            return 1
+        }
+    fi
+
+    return 0
+}
+
+depends() {
+    # We depend on network modules being loaded
+    echo network
+}
+
+inst_sshenv()
+{
+    if [ -d /root/.ssh ]; then
+        inst_dir /root/.ssh
+        chmod 700 ${initdir}/root/.ssh
+    fi
+
+    # Copy over ssh key and knowhosts if needed
+    [[ $sshkey ]] && {
+        inst $sshkey
+        [[ -f /root/.ssh/known_hosts ]] && inst /root/.ssh/known_hosts
+        [[ -f /etc/ssh/ssh_known_hosts ]] && inst /etc/ssh/ssh_known_hosts
+    }
+
+    # Copy over root and system-wide ssh configs.
+    [[ -f /root/.ssh/config ]] && inst /root/.ssh/config
+    [[ -f /etc/ssh/ssh_config ]] && inst /etc/ssh/ssh_config
+
+    return 0
+}
+
+install() {
+    inst ssh
+    inst scp
+    inst_sshenv
+}
+
-- 
1.7.1

Re: [PATCH 4/4 branch usrmove] Add ssh client module code

[Alan Pevec]

On Fri, Dec 23, 2011 at 9:04 AM, Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> with --sshkey option you can provide the ssh key to be installed
>
> Usage:
> 1. sshkey mode:
> transfer your public key to remote machine with ssh-copy-id or do it mannaully
> example of options:
> ./dracut -l -H -a ssh-client --sshkey /root/.ssh/id_rsa i.img
...
> +    # Copy over ssh key and knowhosts if needed
> +    [[ $sshkey ]] && {
> +        inst $sshkey

This means value for sshkey option must include /root/.ssh/ otherwise
it won't end up in the correct place inside initramfs?

Re: [PATCH 4/4 branch usrmove] Add ssh client module code

[Cong Wang]

On Fri, 23 Dec 2011 at 08:04 GMT, Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> Add ssh-client module, which support ssh key mode and interactive mode.
> with --sshkey option you can provide the ssh key to be installed
>
> Usage:
> 1. sshkey mode:
> transfer your public key to remote machine with ssh-copy-id or do it mannaully
> example of options:
> ./dracut -l -H -a ssh-client --sshkey /root/.ssh/id_rsa i.img
> 2. interactive mode:
> need use --ctty option, ie.:
> ./dracut -l -H -a ssh-client --ctty i.img

Seems --sshkey and --ctty are only for ssh-client module,
so, what if the user specifies -sshkey or --ctty but doesn't
use ssh-client module?

Re: [PATCH 4/4 branch usrmove] Add ssh client module code

[Dave Young]

On 12/23/2011 07:17 PM, Alan Pevec wrote:

> On Fri, Dec 23, 2011 at 9:04 AM, Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>> with --sshkey option you can provide the ssh key to be installed
>>
>> Usage:
>> 1. sshkey mode:
>> transfer your public key to remote machine with ssh-copy-id or do it mannaully
>> example of options:
>> ./dracut -l -H -a ssh-client --sshkey /root/.ssh/id_rsa i.img
> ...
>> +    # Copy over ssh key and knowhosts if needed
>> +    [[ $sshkey ]] && {
>> +        inst $sshkey
> 
> This means value for sshkey option must include /root/.ssh/ otherwise
> it won't end up in the correct place inside initramfs?


Thanks for your comment. Yes sshkey will be installed to same location
as the param specified, For kdump we will use an option SSH_KEY_LOCATION
which is defined in kdump.conf, by default it is
/root/.ssh/kdump_id_rsa. In initrd we will use ssh -i SSH_KEY_LOCATION
to connect to remote machine

-- 
Thanks
Dave

Re: [PATCH 4/4 branch usrmove] Add ssh client module code

[Michal Soltys]

On 11-12-25 12:57, Cong Wang wrote:
> On Fri, 23 Dec 2011 at 08:04 GMT, Dave Young<dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>  wrote:
>>  Add ssh-client module, which support ssh key mode and interactive mode.
>>  with --sshkey option you can provide the ssh key to be installed
>>
>>  Usage:
>>  1. sshkey mode:
>>  transfer your public key to remote machine with ssh-copy-id or do it mannaully
>>  example of options:
>>  ./dracut -l -H -a ssh-client --sshkey /root/.ssh/id_rsa i.img
>>  2. interactive mode:
>>  need use --ctty option, ie.:
>>  ./dracut -l -H -a ssh-client --ctty i.img
>
> Seems --sshkey and --ctty are only for ssh-client module,
> so, what if the user specifies -sshkey or --ctty but doesn't
> use ssh-client module?

For the record - ctty part was meant as a general feature - tty with 
control is pretty useful thing to have - and pretty trivial to add, so 
why not.

Though the patches I made earlier also included a few other things, 
dunno what's the state of them (probably none ;) ). HEAD differs 
significantly by now, so maybe I should redo them as v2.

Re: [PATCH 4/4 branch usrmove] Add ssh client module code

[Dave Young]

On 12/25/2011 07:57 PM, Cong Wang wrote:

> On Fri, 23 Dec 2011 at 08:04 GMT, Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>> Add ssh-client module, which support ssh key mode and interactive mode.
>> with --sshkey option you can provide the ssh key to be installed
>>
>> Usage:
>> 1. sshkey mode:
>> transfer your public key to remote machine with ssh-copy-id or do it mannaully
>> example of options:
>> ./dracut -l -H -a ssh-client --sshkey /root/.ssh/id_rsa i.img
>> 2. interactive mode:
>> need use --ctty option, ie.:
>> ./dracut -l -H -a ssh-client --ctty i.img
> 
> Seems --sshkey and --ctty are only for ssh-client module,
> so, what if the user specifies -sshkey or --ctty but doesn't
> use ssh-client module?


Thanks for review.
--sshkey is for ssh module only, I have added param info in doc. --ctty
is not only for ssh, it can be used by other stuff. if use use --sshkey
but do not add ssh-client module it will just have one more global
variable sshkey, it will not add more file to initrd.

As for the param, the ideal way is create generic way to add dracut
module param like something below:
./dracut -a ssh-client,sshkey=xyz

Another way is use kernel param like rd.sshkey=xyz, but I do not like
this way.

So currently generic module param will need more effort also will
influence all dracut modules, I think just add --sshkey is acceptable.

> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe initramfs" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html



-- 
Thanks
Dave

Re: [PATCH 4/4 branch usrmove] Add ssh client module code

[Dave Young]

On 12/26/2011 09:57 AM, Michal Soltys wrote:

> On 11-12-25 12:57, Cong Wang wrote:
>> On Fri, 23 Dec 2011 at 08:04 GMT, Dave Young<dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>  wrote:
>>>  Add ssh-client module, which support ssh key mode and interactive mode.
>>>  with --sshkey option you can provide the ssh key to be installed
>>>
>>>  Usage:
>>>  1. sshkey mode:
>>>  transfer your public key to remote machine with ssh-copy-id or do it
>>> mannaully
>>>  example of options:
>>>  ./dracut -l -H -a ssh-client --sshkey /root/.ssh/id_rsa i.img
>>>  2. interactive mode:
>>>  need use --ctty option, ie.:
>>>  ./dracut -l -H -a ssh-client --ctty i.img
>>
>> Seems --sshkey and --ctty are only for ssh-client module,
>> so, what if the user specifies -sshkey or --ctty but doesn't
>> use ssh-client module?
> 
> For the record - ctty part was meant as a general feature - tty with
> control is pretty useful thing to have - and pretty trivial to add, so
> why not.
> 
> Though the patches I made earlier also included a few other things,
> dunno what's the state of them (probably none ;) ). HEAD differs
> significantly by now, so maybe I should redo them as v2.


Michal, my ssh module is based on usrmove branch of below:
git clone -b usrmove git://git.surfsite.org/pub/git/dracut.git

This branch is intend for some work of generic --mount option which can
benefit /usr mount and kdump target mount

So maybe this branch is different with HEAD as well, how about just keep
your patch align with usrmove branch?

> 
> 
> -- 
> To unsubscribe from this list: send the line "unsubscribe initramfs" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html



-- 
Thanks
Dave

Re: [PATCH 4/4 branch usrmove] Add ssh client module code

[Dave Young]

On 12/26/2011 10:03 AM, Dave Young wrote:

> On 12/25/2011 07:57 PM, Cong Wang wrote:
> 
>> On Fri, 23 Dec 2011 at 08:04 GMT, Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>>> Add ssh-client module, which support ssh key mode and interactive mode.
>>> with --sshkey option you can provide the ssh key to be installed
>>>
>>> Usage:
>>> 1. sshkey mode:
>>> transfer your public key to remote machine with ssh-copy-id or do it mannaully
>>> example of options:
>>> ./dracut -l -H -a ssh-client --sshkey /root/.ssh/id_rsa i.img
>>> 2. interactive mode:
>>> need use --ctty option, ie.:
>>> ./dracut -l -H -a ssh-client --ctty i.img
>>
>> Seems --sshkey and --ctty are only for ssh-client module,
>> so, what if the user specifies -sshkey or --ctty but doesn't
>> use ssh-client module?
> 
> 
> Thanks for review.
> --sshkey is for ssh module only, I have added param info in doc. --ctty
> is not only for ssh, it can be used by other stuff. if use use --sshkey
> but do not add ssh-client module it will just have one more global
> variable sshkey, it will not add more file to initrd.
> 
> As for the param, the ideal way is create generic way to add dracut
> module param like something below:
> ./dracut -a ssh-client,sshkey=xyz
> 
> Another way is use kernel param like rd.sshkey=xyz, but I do not like
> this way.


Oops, kernel param is only usefull for runtime option of initrd, ignore
above line.

> 
> So currently generic module param will need more effort also will
> influence all dracut modules, I think just add --sshkey is acceptable.
> 
>>
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe initramfs" in
>> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> 
> 



-- 
Thanks
Dave

Re: [PATCH 4/4 branch usrmove] Add ssh client module code

[Cong Wang]

On Mon, Dec 26, 2011 at 10:03 AM, Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> On 12/25/2011 07:57 PM, Cong Wang wrote:
>
>> On Fri, 23 Dec 2011 at 08:04 GMT, Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>>> Add ssh-client module, which support ssh key mode and interactive mode.
>>> with --sshkey option you can provide the ssh key to be installed
>>>
>>> Usage:
>>> 1. sshkey mode:
>>> transfer your public key to remote machine with ssh-copy-id or do it mannaully
>>> example of options:
>>> ./dracut -l -H -a ssh-client --sshkey /root/.ssh/id_rsa i.img
>>> 2. interactive mode:
>>> need use --ctty option, ie.:
>>> ./dracut -l -H -a ssh-client --ctty i.img
>>
>> Seems --sshkey and --ctty are only for ssh-client module,
>> so, what if the user specifies -sshkey or --ctty but doesn't
>> use ssh-client module?
>
>
> Thanks for review.
> --sshkey is for ssh module only, I have added param info in doc. --ctty
> is not only for ssh, it can be used by other stuff. if use use --sshkey
> but do not add ssh-client module it will just have one more global
> variable sshkey, it will not add more file to initrd.

I am not objecting --sshkey, I am suggesting to print something
to say --sshkey has no effect when ssh-client module is not included.

>
> As for the param, the ideal way is create generic way to add dracut
> module param like something below:
> ./dracut -a ssh-client,sshkey=xyz
>

True, dracut does lack some way to pass a module specific parameter
from command line...

Re: [PATCH 4/4 branch usrmove] Add ssh client module code

[Cong Wang]

On Mon, Dec 26, 2011 at 9:57 AM, Michal Soltys <soltys-R61QfzASbfY@public.gmane.org> wrote:
>
> For the record - ctty part was meant as a general feature - tty with control
> is pretty useful thing to have - and pretty trivial to add, so why not.
>
> Though the patches I made earlier also included a few other things, dunno
> what's the state of them (probably none ;) ). HEAD differs significantly by
> now, so maybe I should redo them as v2.
>

Thanks for teaching this.

As ssh-module needs --ctty, it is good to let Dave send them as a
whole patchset,
of course, you are still the author of that patch. :)

Re: [PATCH 4/4 branch usrmove] Add ssh client module code

[Dave Young]

On 12/26/2011 01:06 PM, Cong Wang wrote:

> On Mon, Dec 26, 2011 at 10:03 AM, Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>> On 12/25/2011 07:57 PM, Cong Wang wrote:
>>
>>> On Fri, 23 Dec 2011 at 08:04 GMT, Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>>>> Add ssh-client module, which support ssh key mode and interactive mode.
>>>> with --sshkey option you can provide the ssh key to be installed
>>>>
>>>> Usage:
>>>> 1. sshkey mode:
>>>> transfer your public key to remote machine with ssh-copy-id or do it mannaully
>>>> example of options:
>>>> ./dracut -l -H -a ssh-client --sshkey /root/.ssh/id_rsa i.img
>>>> 2. interactive mode:
>>>> need use --ctty option, ie.:
>>>> ./dracut -l -H -a ssh-client --ctty i.img
>>>
>>> Seems --sshkey and --ctty are only for ssh-client module,
>>> so, what if the user specifies -sshkey or --ctty but doesn't
>>> use ssh-client module?
>>
>>
>> Thanks for review.
>> --sshkey is for ssh module only, I have added param info in doc. --ctty
>> is not only for ssh, it can be used by other stuff. if use use --sshkey
>> but do not add ssh-client module it will just have one more global
>> variable sshkey, it will not add more file to initrd.
> 
> I am not objecting --sshkey, I am suggesting to print something
> to say --sshkey has no effect when ssh-client module is not included.


yes, print some info is better, will do

> 
>>
>> As for the param, the ideal way is create generic way to add dracut
>> module param like something below:
>> ./dracut -a ssh-client,sshkey=xyz
>>
> 
> True, dracut does lack some way to pass a module specific parameter
> from command line...



-- 
Thanks
Dave