diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-03-30 15:21:19 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-03-30 15:21:19 -0500 |
| commit | b4a027550acf2c1051c34f997b8e7e845017af4b (patch) | |
| tree | 9e38d3c17b42cb1e6765620a87e908973a93c821 /yocto-poky/meta/recipes-core/dropbear | |
| parent | 2fe86d90044af218ced8f42fdded6b136f1046d2 (diff) | |
| parent | f1e5d6968976c2341c6d554bfcc8895f1b33c26b (diff) | |
| download | talos-openbmc-b4a027550acf2c1051c34f997b8e7e845017af4b.tar.gz talos-openbmc-b4a027550acf2c1051c34f997b8e7e845017af4b.zip | |
Merge commit 'f1e5d6968976c2341c6d554bfcc8895f1b33c26b' from yocto-2.0.1
Diffstat (limited to 'yocto-poky/meta/recipes-core/dropbear')
| -rw-r--r-- | yocto-poky/meta/recipes-core/dropbear/dropbear/dropbear@.service | 3 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-core/dropbear/dropbear/dropbearkey.service | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbear@.service b/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbear@.service index 6fe994209..b420bcddc 100644 --- a/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbear@.service +++ b/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbear@.service @@ -4,8 +4,9 @@ Wants=dropbearkey.service After=syslog.target dropbearkey.service [Service] +Environment="DROPBEAR_RSAKEY_DIR=/etc/dropbear" EnvironmentFile=-/etc/default/dropbear -ExecStart=-@SBINDIR@/dropbear -i -r /etc/dropbear/dropbear_rsa_host_key $DROPBEAR_EXTRA_ARGS +ExecStart=-@SBINDIR@/dropbear -i -r ${DROPBEAR_RSAKEY_DIR}/dropbear_rsa_host_key $DROPBEAR_EXTRA_ARGS ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID StandardInput=socket KillMode=process diff --git a/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbearkey.service b/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbearkey.service index ccc21d5cc..c49053d57 100644 --- a/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbearkey.service +++ b/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbearkey.service @@ -1,8 +1,13 @@ [Unit] Description=SSH Key Generation -ConditionPathExists=|!/etc/dropbear/dropbear_rsa_host_key +RequiresMountsFor=/var /var/lib +ConditionPathExists=!/etc/dropbear/dropbear_rsa_host_key +ConditionPathExists=!/var/lib/dropbear/dropbear_rsa_host_key [Service] +Environment="DROPBEAR_RSAKEY_DIR=/etc/dropbear" +EnvironmentFile=-/etc/default/dropbear Type=oneshot -ExecStart=@SBINDIR@/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key +ExecStart=@BASE_BINDIR@/mkdir -p ${DROPBEAR_RSAKEY_DIR} +ExecStart=@SBINDIR@/dropbearkey -t rsa -f ${DROPBEAR_RSAKEY_DIR}/dropbear_rsa_host_key RemainAfterExit=yes |
