From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QUGsU-0007ge-8l for garchives@archives.gentoo.org; Wed, 08 Jun 2011 11:24:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 381BA1C044; Wed, 8 Jun 2011 11:24:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EB3531C044 for ; Wed, 8 Jun 2011 11:24:41 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CDEDC1B401F for ; Wed, 8 Jun 2011 11:24:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3E5268003C for ; Wed, 8 Jun 2011 11:24:40 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: Subject: [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/ X-VCS-Repository: dev/mgorny X-VCS-Files: sys-apps/systemd/Manifest sys-apps/systemd/systemd-9999.ebuild X-VCS-Directories: sys-apps/systemd/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b80d7b0634e2b27184422e60dde04b71004e03ed Date: Wed, 8 Jun 2011 11:24:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 71380dce2ef855babdf3ba3ffbc884cc commit: b80d7b0634e2b27184422e60dde04b71004e03ed Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Wed Jun 8 11:14:03 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Wed Jun 8 11:14:03 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/mgorny.git;a=3D= commit;h=3Db80d7b06 sys-apps/systemd: Sync from gx86. (Portage version: 2.2.0_alpha38_p1/git/Linux x86_64, signed Manifest comm= it with key 42B9401D) --- sys-apps/systemd/Manifest | 12 +++++----- sys-apps/systemd/systemd-9999.ebuild | 42 +++++++++-------------------= ----- 2 files changed, 18 insertions(+), 36 deletions(-) diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index ca05be4..47d8135 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,14 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 =20 -EBUILD systemd-9999.ebuild 3905 RMD160 1034d0467132db85b986c5883247e8651= 9171705 SHA1 185f287b3dede21e09f988505ef1d741918e10fb SHA256 2f1ad3fc325e= 559c74571239c570f230ba970ffce1cb6fefdcd01cc48c87433b +EBUILD systemd-9999.ebuild 3324 RMD160 16c593fe409b969330f9396dfa1098417= 9d5e0cc SHA1 52ffdd7d3f1af63b038677c65e26897372835425 SHA256 4db7a3bf6b71= b507d70723b3662673a699106bb7679f2472b86158819376fb98 MISC metadata.xml 532 RMD160 9f5a8f7563e27323c5827c45c929cde322283b45 SH= A1 862697f70e43ce66b0cace76e791bb73d9389c00 SHA256 1e18687866714408f81dbd= f4849ae598a4a6914fae2de83e1d2220af197a39cd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -iJwEAQEIAAYFAk3uNlMACgkQfXuS5UK5QB3ECgP/RzlsiXy85ZJ/Kw7m3LdA9MyV -s4eaAZMtzSzmbv8imSFhPzRtkQ+GlPWURLSA/Lnu5l0ApSO3IxUV5Z/q/SDbnAfp -bMsrAwIL3xWFIiJKehp4nPa1QCbVzOvLjt6btu+981cIpRGu7bv23drTdGRzYu8i -NyTg0IAXRSVQR36gDuo=3D -=3D7i3B +iJwEAQEIAAYFAk3vWXsACgkQfXuS5UK5QB0S8wQAr0FJf2ofHFq/jdDZw7v5zfra +DzLmlkaCv7l74JuGlfz9nXdO3SK0zDd32mZrPA+GGZOfSklcq6Z+8W9pn9fHB7a5 +luebHYIFntc7nghaITt//rubZ6vVQJmetvRQEf24OYnCrjPNcKvVU4NVu/VABRuA +ZopINvl+tj/PK9kOCv8=3D +=3DI2o6 -----END PGP SIGNATURE----- diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/syst= emd-9999.ebuild index 1404c0b..872dc72 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -8,7 +8,7 @@ EGIT_REPO_URI=3D"git://anongit.freedesktop.org/${PN} http://cgit.freedesktop.org/${PN}/" inherit autotools autotools-utils git-2 linux-info pam =20 -DESCRIPTION=3D"systemd is a system and service manager for Linux" +DESCRIPTION=3D"System and service manager for Linux" HOMEPAGE=3D"http://www.freedesktop.org/wiki/Software/systemd" SRC_URI=3D"" =20 @@ -17,7 +17,7 @@ SLOT=3D"0" KEYWORDS=3D"" IUSE=3D"audit gtk cryptsetup pam selinux tcpd" =20 -COMMON_DEPEND=3D">=3Dsys-apps/dbus-1.4.8-r1 +COMMON_DEPEND=3D">=3Dsys-apps/dbus-1.4.10 >=3Dsys-apps/util-linux-2.19 >=3Dsys-fs/udev-171 sys-libs/libcap @@ -108,37 +108,19 @@ src_install() { keepdir /run } =20 -check_mtab_is_symlink() { +pkg_postinst() { if [[ ! -L "${ROOT}"etc/mtab ]]; then - ewarn "${ROOT}etc/mtab must be a symlink to ${ROOT}proc/self/mounts!" - ewarn "To correct that, execute" - ewarn " $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'" - fi -} - -systemd_machine_id_setup() { - einfo "Setting up /etc/machine-id..." - if ! "${ROOT}"bin/systemd-machine-id-setup; then - ewarn "Setting up /etc/machine-id failed, to fix it please see" - ewarn " http://lists.freedesktop.org/archives/dbus/2011-March/014187.= html" - elif [[ ! -L "${ROOT}"var/lib/dbus/machine-id ]]; then - # This should be fixed in the dbus ebuild, but we warn about it here. - ewarn "${ROOT}var/lib/dbus/machine-id ideally should be a symlink to" - ewarn "${ROOT}etc/machine-id to make it clear that they have the same" - ewarn "content." + ewarn "Upstream suggests that the /etc/mtab file should be a symlink t= o /proc/mounts." + ewarn "It is known to cause users being unable to unmount user mounts.= If you don't" + ewarn "require that specific feature, please call:" + ewarn " $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'" + ewarn fi -} =20 -pkg_postinst() { - check_mtab_is_symlink - systemd_machine_id_setup - - # Inform user about extra configuration - elog "You may need to perform some additional configuration for some" - elog "programs to work, see the systemd manpages for loading modules an= d" - elog "handling tmpfiles:" - elog " $ man modules-load.d" - elog " $ man tmpfiles.d" + elog "You may need to perform some additional configuration for some pr= ograms" + elog "to work, see the systemd manpages for loading modules and handlin= g tmpfiles:" + elog " $ man modules-load.d" + elog " $ man tmpfiles.d" elog =20 ewarn "This a work-in-progress ebuild. You may brick your system. Have = fun!"