Fix DESCRIPTION. Rely on dbus-1.4.10 to set up /etc/machine-id for us. Add a warning about downsides of having /etc/mtab symlinked, reformat messages.

(Portage version: 2.2.0_alpha38_p1/cvs/Linux x86_64)

2 files changed, 18 insertions, 32 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index dc19f0e9a7b4..db0efa6312e7 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.3 2011/06/07 14:10:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.4 2011/06/08 11:08:41 mgorny Exp $
+
+  08 Jun 2011; Michał Górny <mgorny@gentoo.org> systemd-28.ebuild:
+  Fix DESCRIPTION. Rely on dbus-1.4.10 to set up /etc/machine-id for us. Add a
+  warning about downsides of having /etc/mtab symlinked, reformat messages.
 
   07 Jun 2011; Michał Górny <mgorny@gentoo.org> systemd-28.ebuild,
   metadata.xml:
diff --git a/sys-apps/systemd/systemd-28.ebuild b/sys-apps/systemd/systemd-28.ebuild
index 9cd677719fcf..a655ebd80d35 100644
--- a/sys-apps/systemd/systemd-28.ebuild
+++ b/sys-apps/systemd/systemd-28.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-28.ebuild,v 1.2 2011/06/07 14:10:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-28.ebuild,v 1.3 2011/06/08 11:08:41 mgorny Exp $
 
 EAPI=4
 
 inherit autotools-utils linux-info pam
 
-DESCRIPTION="systemd is a system and service manager for Linux"
+DESCRIPTION="System and service manager for Linux"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
 SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.bz2"
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="audit cryptsetup gtk pam selinux tcpd"
 
-COMMON_DEPEND=">=sys-apps/dbus-1.4.8-r1
+COMMON_DEPEND=">=sys-apps/dbus-1.4.10
 	>=sys-fs/udev-171
 	>=sys-apps/util-linux-2.19
 	sys-libs/libcap
@@ -102,37 +102,19 @@ src_install() {
 	keepdir /run
 }
 
-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 to /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
-}
 
-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 and"
-	elog "handling tmpfiles:"
-	elog "    $ man modules-load.d"
-	elog "    $ man tmpfiles.d"
+	elog "You may need to perform some additional configuration for some programs"
+	elog "to work, see the systemd manpages for loading modules and handling tmpfiles:"
+	elog "	$ man modules-load.d"
+	elog "	$ man tmpfiles.d"
 	elog
 
 	ewarn "Please note this is a work-in-progress and many packages in Gentoo"