diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-09-30 15:53:18 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-01 07:40:36 +0100 |
| commit | 7e13fc603aa86219bf15e355ca9ea9275308cca5 (patch) | |
| tree | f4492ab56aaa70681dcbeacd83f1832f8bb05a93 /meta/recipes-core/dropbear | |
| parent | a4b91f5199dd4d1302484cbd972a484d36f7886f (diff) | |
| download | openembedded-core-7e13fc603aa86219bf15e355ca9ea9275308cca5.tar.gz openembedded-core-7e13fc603aa86219bf15e355ca9ea9275308cca5.tar.bz2 openembedded-core-7e13fc603aa86219bf15e355ca9ea9275308cca5.zip | |
dropbear: fix key generation when systemd is in use and rootfs is readonly
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dropbear')
| -rw-r--r-- | meta/recipes-core/dropbear/dropbear/dropbear@.service | 3 | ||||
| -rw-r--r-- | meta/recipes-core/dropbear/dropbear/dropbearkey.service | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/meta/recipes-core/dropbear/dropbear/dropbear@.service b/meta/recipes-core/dropbear/dropbear/dropbear@.service index 6fe9942090..b420bcddcb 100644 --- a/meta/recipes-core/dropbear/dropbear/dropbear@.service +++ b/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/meta/recipes-core/dropbear/dropbear/dropbearkey.service b/meta/recipes-core/dropbear/dropbear/dropbearkey.service index ccc21d5cca..c49053d57c 100644 --- a/meta/recipes-core/dropbear/dropbear/dropbearkey.service +++ b/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 |