From 855e8d63a67aee347296e17e596d45be0d75ac9d Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 10 Jun 2012 21:46:52 +0000 Subject: openssh: 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-connectivity/openssh/openssh/sshd.socket | 11 ----------- meta-oe/recipes-connectivity/openssh/openssh/sshd@.service | 9 --------- .../recipes-connectivity/openssh/openssh/sshdgenkeys.service | 10 ---------- meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend | 10 ---------- .../meta-oe/recipes-connectivity/openssh/openssh/sshd.socket | 11 +++++++++++ .../recipes-connectivity/openssh/openssh/sshd@.service | 9 +++++++++ .../recipes-connectivity/openssh/openssh/sshdgenkeys.service | 10 ++++++++++ .../recipes-connectivity/openssh/openssh_6.0p1.bbappend | 10 ++++++++++ 8 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/openssh/openssh/sshd.socket delete mode 100644 meta-oe/recipes-connectivity/openssh/openssh/sshd@.service delete mode 100644 meta-oe/recipes-connectivity/openssh/openssh/sshdgenkeys.service delete mode 100644 meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend create mode 100644 meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshd.socket create mode 100644 meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshd@.service create mode 100644 meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshdgenkeys.service create mode 100644 meta-systemd/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend diff --git a/meta-oe/recipes-connectivity/openssh/openssh/sshd.socket b/meta-oe/recipes-connectivity/openssh/openssh/sshd.socket deleted file mode 100644 index 753a33b393..0000000000 --- a/meta-oe/recipes-connectivity/openssh/openssh/sshd.socket +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Conflicts=sshd.service - -[Socket] -ExecStartPre=/bin/mkdir -p /var/run/sshd -ListenStream=22 -Accept=yes - -[Install] -WantedBy=sockets.target -Also=sshdgenkeys.service diff --git a/meta-oe/recipes-connectivity/openssh/openssh/sshd@.service b/meta-oe/recipes-connectivity/openssh/openssh/sshd@.service deleted file mode 100644 index d118490bdb..0000000000 --- a/meta-oe/recipes-connectivity/openssh/openssh/sshd@.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=OpenSSH Per-Connection Daemon -After=sshdgenkeys.service - -[Service] -ExecStart=-/usr/sbin/sshd -i -ExecReload=/bin/kill -HUP $MAINPID -StandardInput=socket -StandardError=syslog diff --git a/meta-oe/recipes-connectivity/openssh/openssh/sshdgenkeys.service b/meta-oe/recipes-connectivity/openssh/openssh/sshdgenkeys.service deleted file mode 100644 index c717214c55..0000000000 --- a/meta-oe/recipes-connectivity/openssh/openssh/sshdgenkeys.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=SSH Key Generation - -[Service] -ExecStart=/usr/bin/ssh-keygen -A -Type=oneshot -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend b/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend deleted file mode 100644 index de7668fb54..0000000000 --- a/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -PRINC := "${@int(PRINC) + 2}" - -SYSTEMD_PACKAGES = "openssh-sshd-systemd" -SYSTEMD_SERVICE = "sshd.socket" - -inherit systemd - -SRC_URI += "file://sshd.socket file://sshd@.service file://sshdgenkeys.service" diff --git a/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshd.socket b/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshd.socket new file mode 100644 index 0000000000..753a33b393 --- /dev/null +++ b/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshd.socket @@ -0,0 +1,11 @@ +[Unit] +Conflicts=sshd.service + +[Socket] +ExecStartPre=/bin/mkdir -p /var/run/sshd +ListenStream=22 +Accept=yes + +[Install] +WantedBy=sockets.target +Also=sshdgenkeys.service diff --git a/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshd@.service b/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshd@.service new file mode 100644 index 0000000000..d118490bdb --- /dev/null +++ b/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshd@.service @@ -0,0 +1,9 @@ +[Unit] +Description=OpenSSH Per-Connection Daemon +After=sshdgenkeys.service + +[Service] +ExecStart=-/usr/sbin/sshd -i +ExecReload=/bin/kill -HUP $MAINPID +StandardInput=socket +StandardError=syslog diff --git a/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshdgenkeys.service b/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshdgenkeys.service new file mode 100644 index 0000000000..c717214c55 --- /dev/null +++ b/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshdgenkeys.service @@ -0,0 +1,10 @@ +[Unit] +Description=SSH Key Generation + +[Service] +ExecStart=/usr/bin/ssh-keygen -A +Type=oneshot +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend b/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend new file mode 100644 index 0000000000..a708a36c1c --- /dev/null +++ b/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +PRINC := "${@int(PRINC) + 3}" + +SYSTEMD_PACKAGES = "openssh-sshd-systemd" +SYSTEMD_SERVICE = "sshd.socket" + +inherit systemd + +SRC_URI += "file://sshd.socket file://sshd@.service file://sshdgenkeys.service" -- cgit v1.2.3-54-g00ecf