From 0cee7e28f0ad77c8da7067eda7794cdd4576c7e2 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 10 Jun 2012 21:46:56 +0000 Subject: dropbear: move systemd support to meta-systemd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- meta-oe/recipes-core/dropbear/dropbear/dropbear.socket | 10 ---------- .../recipes-core/dropbear/dropbear/dropbear@.service | 9 --------- .../recipes-core/dropbear/dropbear/dropbearkey.service | 10 ---------- meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend | 17 ----------------- .../recipes-core/dropbear/dropbear/dropbear.socket | 10 ++++++++++ .../recipes-core/dropbear/dropbear/dropbear@.service | 9 +++++++++ .../recipes-core/dropbear/dropbear/dropbearkey.service | 10 ++++++++++ .../recipes-core/dropbear/dropbear_2012.55.bbappend | 17 +++++++++++++++++ 8 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 meta-oe/recipes-core/dropbear/dropbear/dropbear.socket delete mode 100644 meta-oe/recipes-core/dropbear/dropbear/dropbear@.service delete mode 100644 meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service delete mode 100644 meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend create mode 100644 meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket create mode 100644 meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service create mode 100644 meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service create mode 100644 meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend diff --git a/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket b/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket deleted file mode 100644 index e5c61b755e..0000000000 --- a/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Conflicts=dropbear.service - -[Socket] -ListenStream=22 -Accept=yes - -[Install] -WantedBy=sockets.target -Also=dropbearkey.service diff --git a/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service b/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service deleted file mode 100644 index 4fba3f05c8..0000000000 --- a/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=SSH Per-Connection Server -Requires=dropbearkey.service -After=syslog.target dropbearkey.service - -[Service] -ExecStart=-/usr/sbin/dropbear -i -r /etc/dropbear/dropbear_rsa_host_key -p 22 -ExecReload=/bin/kill -HUP $MAINPID -StandardInput=socket diff --git a/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service b/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service deleted file mode 100644 index 7f03000ebc..0000000000 --- a/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=SSH Key Generation -ConditionPathExists=|!/etc/dropbear/dropbear_rsa_host_key - -[Service] -ExecStart=/usr/sbin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend b/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend deleted file mode 100644 index fc5d0476a6..0000000000 --- a/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend +++ /dev/null @@ -1,17 +0,0 @@ -inherit systemd - -PRINC := "${@int(PRINC) + 2}" - -# look for files in the layer first -FILESEXTRAPATHS := "${THISDIR}/${PN}" - -SRC_URI += "file://dropbearkey.service \ - file://dropbear@.service \ - file://dropbear.socket" - -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE_${PN}-systemd = "dropbear.socket" - -do_install_append() { - ln -sf /dev/null ${D}${systemd_unitdir}/system/dropbear.service -} diff --git a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket new file mode 100644 index 0000000000..e5c61b755e --- /dev/null +++ b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket @@ -0,0 +1,10 @@ +[Unit] +Conflicts=dropbear.service + +[Socket] +ListenStream=22 +Accept=yes + +[Install] +WantedBy=sockets.target +Also=dropbearkey.service diff --git a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service new file mode 100644 index 0000000000..4fba3f05c8 --- /dev/null +++ b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service @@ -0,0 +1,9 @@ +[Unit] +Description=SSH Per-Connection Server +Requires=dropbearkey.service +After=syslog.target dropbearkey.service + +[Service] +ExecStart=-/usr/sbin/dropbear -i -r /etc/dropbear/dropbear_rsa_host_key -p 22 +ExecReload=/bin/kill -HUP $MAINPID +StandardInput=socket diff --git a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service new file mode 100644 index 0000000000..7f03000ebc --- /dev/null +++ b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service @@ -0,0 +1,10 @@ +[Unit] +Description=SSH Key Generation +ConditionPathExists=|!/etc/dropbear/dropbear_rsa_host_key + +[Service] +ExecStart=/usr/sbin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend new file mode 100644 index 0000000000..15546e1ad6 --- /dev/null +++ b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend @@ -0,0 +1,17 @@ +inherit systemd + +PRINC := "${@int(PRINC) + 3}" + +# look for files in the layer first +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://dropbearkey.service \ + file://dropbear@.service \ + file://dropbear.socket" + +SYSTEMD_PACKAGES = "${PN}-systemd" +SYSTEMD_SERVICE_${PN}-systemd = "dropbear.socket" + +do_install_append() { + ln -sf /dev/null ${D}${systemd_unitdir}/system/dropbear.service +} -- cgit 1.2.3-korg