* [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-28.ebuild ChangeLog
@ 2011-06-08 11:08 Michal Gorny (mgorny)
0 siblings, 0 replies; only message in thread
From: Michal Gorny (mgorny) @ 2011-06-08 11:08 UTC (permalink / raw
To: gentoo-commits
mgorny 11/06/08 11:08:41
Modified: systemd-28.ebuild ChangeLog
Log:
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)
Revision Changes Path
1.3 sys-apps/systemd/systemd-28.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-28.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-28.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-28.ebuild?r1=1.2&r2=1.3
Index: systemd-28.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-28.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- systemd-28.ebuild 7 Jun 2011 14:10:44 -0000 1.2
+++ systemd-28.ebuild 8 Jun 2011 11:08:41 -0000 1.3
@@ -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 @@
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 @@
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"
1.4 sys-apps/systemd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.3&r2=1.4
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog 7 Jun 2011 14:10:44 -0000 1.3
+++ ChangeLog 8 Jun 2011 11:08:41 -0000 1.4
@@ -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:
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-06-08 11:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-08 11:08 [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-28.ebuild ChangeLog Michal Gorny (mgorny)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox