diff options
| author |   Henry Gebhardt <hsggebhardt@googlemail.com> | 2011-11-10 22:27:54 +0100 |
|---|---|---|
| committer | Henry Gebhardt <hsggebhardt@googlemail.com> | 2011-11-10 22:28:55 +0100 |
| commit | 0d9ab5c116258b1f2f98b4255e415f93e3392e57 (patch) | |
| tree | 2707ec45b51cdc75f4dc9901b13c23a3930f7e4f | |
| parent | sys-apps/systemd-9999: introduce "ingnome3" use flag (diff) | |
| download | systemd-0d9ab5c116258b1f2f98b4255e415f93e3392e57.tar.gz systemd-0d9ab5c116258b1f2f98b4255e415f93e3392e57.tar.bz2 systemd-0d9ab5c116258b1f2f98b4255e415f93e3392e57.zip | |
sys-apps/systemd-units-9999: Ignore return value of sshd in sshd@.service
See http://lists.freedesktop.org/archives/systemd-devel/2011-February/001359.html
| -rw-r--r-- | sys-apps/systemd-units/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/systemd-units/files/sshd_at.patch | 12 | ||||
| -rw-r--r-- | sys-apps/systemd-units/systemd-units-9999.ebuild | 17 |
3 files changed, 27 insertions, 5 deletions
diff --git a/sys-apps/systemd-units/Manifest b/sys-apps/systemd-units/Manifest index 7f64066..5b076d8 100644 --- a/sys-apps/systemd-units/Manifest +++ b/sys-apps/systemd-units/Manifest @@ -29,9 +29,10 @@ AUX services-server/uptimed.service 318 RMD160 ec151b5044e5530f609e67ae15cd26821 AUX services-server/vsftpd.service 210 RMD160 5c900ed1811cf6d2f9a47abd23e3a433d4f1e3a0 SHA1 0a66aecf94fe6e239fc700662322ea7a5e2b1044 SHA256 78ccea56242fc20f89a07120d61cd87e4b80378418c1bc120f58b65617144b70 AUX services-server/vsftpd.socket 104 RMD160 527beec3b8fcf303aa74bd01864f03dc208f6bb8 SHA1 5b7a7a1e0c04acfcc2dba1346557f1193b9905ba SHA256 9fdbfd2ec0207170371ca3cf2b0ddca2dc2fe3d062e5792e0d3e51474c3198c9 AUX services-server/vsftpd@.service 171 RMD160 7d6802b920daee9ccc18343fcda8d9352aa16efb SHA1 d76e2e22ce8c28f8d89deda86b5485dcb04e0fb5 SHA256 a5eb377f4439ca57c7c7d016a367054cfbbd78e66db7d78cb3eff93974728bfd +AUX sshd_at.patch 372 RMD160 9378850ef99c5e4b73dc0bf36b29f9bb73e9e7c8 SHA1 9947c10a8ee138513117d49282a6b4146aa2f8ca SHA256 60de49ac52f117a299d27e56e1046cb9d1dc9bf21bbdd1ad7ec3c81c7632190f AUX tmpfiles-server/mysqld.conf 107 RMD160 bae9d6739af31d3f29573cd3982c48c0da5168bc SHA1 e64ab7ba5b0c25828e996d03e56a5b66e997f2b0 SHA256 190cba2f96a2d25ee9391c0005900d11bcbaf12122f15c06591188e25aaca180 DIST sshd.service 463 RMD160 2ca446597a331831789fc6b1f8a0d11a8b543f4d SHA1 7a61e7f7422a0c7879e22412ab3aacdfebd44733 SHA256 51fee725a34e957342c258c5cfae072b8002d405c3caa9dd99735def3c385aed DIST sshd.socket 102 RMD160 fb40df88d7345dbb30d7b76e9e449b3ddd54b5a5 SHA1 313e04677de240a2279c9cfbdfdb5347ac6a9c3b SHA256 efc5cf5e700036acdae0602bc551f71adf9a29af8b85505db7195382fc475f03 DIST sshd@.service 125 RMD160 635b7139e531d391f4319b055bcc47b56f049201 SHA1 efcf3443df27a6f8354b39bbd8f2e6c42af7bbab SHA256 7a37e9240a7899cfcf8faedf4ebfa282bac86a738a37f38e68f8ed61c781e3fa -EBUILD systemd-units-9999.ebuild 1096 RMD160 3e6b3862b1a1fd008bde751fc7aa053a2711d9d9 SHA1 8f2e77961a0b74712729a6c04d2b51f181d2b47d SHA256 77bb7eaff025c8d1c5093cdc800192cd6e7e1585ad882e79c35ab891b3f92aa5 +EBUILD systemd-units-9999.ebuild 1280 RMD160 f5f7fcbb2cc8e11d1a4cc6994df77d0a3ef1c2ca SHA1 1a01e21f076a6ce856dcb60e82ed3bc7293bcf5e SHA256 40d9231d7306db81436317c7d66df93c80ad912981be7360212bdc56a179ce05 MISC metadata.xml 602 RMD160 512aa6adb816a3d4a7d3e6393131f5909899876f SHA1 37a5b8608c766081fd11fbc7fc98f2af0c6bfc77 SHA256 823bda585e1b5e1ca3c42c9c1c3b6759174dd44b536bce4011d5aeaa8670787e diff --git a/sys-apps/systemd-units/files/sshd_at.patch b/sys-apps/systemd-units/files/sshd_at.patch new file mode 100644 index 0000000..42131bc --- /dev/null +++ b/sys-apps/systemd-units/files/sshd_at.patch @@ -0,0 +1,12 @@ +See http://lists.freedesktop.org/archives/systemd-devel/2011-February/001359.html +--- +diff -Naur ./sshd@.service ./sshd@.service +--- ./sshd@.service 2011-11-10 22:11:55.372138953 +0100 ++++ ./sshd@.service 2011-11-10 22:12:43.709534651 +0100 +@@ -3,5 +3,5 @@ + After=syslog.target + + [Service] +-ExecStart=/usr/sbin/sshd -i ++ExecStart=-/usr/sbin/sshd -i + StandardInput=socket diff --git a/sys-apps/systemd-units/systemd-units-9999.ebuild b/sys-apps/systemd-units/systemd-units-9999.ebuild index 017a946..bba41e9 100644 --- a/sys-apps/systemd-units/systemd-units-9999.ebuild +++ b/sys-apps/systemd-units/systemd-units-9999.ebuild @@ -3,7 +3,7 @@ # $Header: $ EAPI=3 -inherit systemd +inherit eutils systemd DESCRIPTION="Service files for sys-apps/systemd" HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd http://en.gentoo-wiki.com/wiki/Systemd" @@ -19,12 +19,21 @@ IUSE="+basic +desktop server +ingnome3" RDEPEND="" DEPEND="" +src_prepare() { + if use basic; then + cp "${DISTDIR}/sshd.service" . || die + cp "${DISTDIR}/sshd.socket" . || die + cp "${DISTDIR}/sshd@.service" . || die + epatch "${FILESDIR}"/sshd_at.patch || die + fi +} + src_install() { if use basic; then systemd_dounit "${FILESDIR}"/services-basic/* - systemd_dounit "${DISTDIR}/sshd.service" - systemd_dounit "${DISTDIR}/sshd.socket" - systemd_dounit "${DISTDIR}/sshd@.service" + systemd_dounit "sshd.service" + systemd_dounit "sshd.socket" + systemd_dounit "sshd@.service" fi if use server; then |