diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2007-04-20 23:22:33 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2007-04-20 23:22:33 +0000 |
| commit | 90dec2a9ff97c29e030c4a51efd7e41ce7f928a7 (patch) | |
| tree | 925ef5976e812b441559e850d4663ddd2837377f /sys-apps/hal | |
| parent | forgot to mask mythweb (diff) | |
| download | gentoo-2-90dec2a9ff97c29e030c4a51efd7e41ce7f928a7.tar.gz gentoo-2-90dec2a9ff97c29e030c4a51efd7e41ce7f928a7.tar.bz2 gentoo-2-90dec2a9ff97c29e030c4a51efd7e41ce7f928a7.zip | |
better checking of /proc/mounts's / reference. drop arches that don't have ~arch for hal-info for QA.
(Portage version: 2.1.2.4)
Diffstat (limited to 'sys-apps/hal')
| -rw-r--r-- | sys-apps/hal/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/hal/files/0.5.9-hald.rc | 10 | ||||
| -rw-r--r-- | sys-apps/hal/hal-0.5.9.ebuild | 4 |
3 files changed, 15 insertions, 6 deletions
diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog index c81d7960328c..e351f798b537 100644 --- a/sys-apps/hal/ChangeLog +++ b/sys-apps/hal/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/hal # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.173 2007/04/19 19:49:52 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.174 2007/04/20 23:22:33 cardoe Exp $ + + 20 Apr 2007; Doug Goldstein <cardoe@gentoo.org> files/0.5.9-hald.rc, + hal-0.5.9.ebuild: + better checking of /proc/mounts's / reference. drop arches that don't have + ~arch for hal-info for QA. 19 Apr 2007; Doug Goldstein <cardoe@gentoo.org> +files/0.5.9/15_spec_fdi_matching.patch, diff --git a/sys-apps/hal/files/0.5.9-hald.rc b/sys-apps/hal/files/0.5.9-hald.rc index 4f4dac10b1bb..71aba2b2218c 100644 --- a/sys-apps/hal/files/0.5.9-hald.rc +++ b/sys-apps/hal/files/0.5.9-hald.rc @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/files/0.5.9-hald.rc,v 1.5 2007/04/19 16:34:58 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/files/0.5.9-hald.rc,v 1.6 2007/04/20 23:22:33 cardoe Exp $ depend() { need dbus @@ -13,9 +13,13 @@ start() { [ -z "${HALD_VERBOSE}" ] && HALD_VERBOSE="no" ebegin "Starting Hardware Abstraction Layer daemon" - if [ ! -e /dev/root ]; then - echo "You need a /dev/root that points to your device that contains /" + REAL_ROOT=`mount -fv / | cut -d' ' -f1` + TEST_ROOT=`cat /proc/mounts | cut -d' ' -f1 | head -n 2 | tail -n 1` + + if [ ! -e ${TEST_ROOT} ]; then + echo "You need a ${TEST_ROOT} that points to your ${REAL_ROOT}" echo "See http://bugs.gentoo.org/show_bug.cgi?id=175243" + echo "Quick fix is: ln -s ${REAL_ROOT} ${TEST_ROOT}" eend 2 fi diff --git a/sys-apps/hal/hal-0.5.9.ebuild b/sys-apps/hal/hal-0.5.9.ebuild index aba2d4e51c77..b3352392c696 100644 --- a/sys-apps/hal/hal-0.5.9.ebuild +++ b/sys-apps/hal/hal-0.5.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.ebuild,v 1.24 2007/04/18 14:31:07 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.ebuild,v 1.25 2007/04/20 23:22:33 cardoe Exp $ inherit eutils linux-info autotools flag-o-matic @@ -10,7 +10,7 @@ SRC_URI="http://people.freedesktop.org/~david/dist/${P}.tar.gz" LICENSE="|| ( GPL-2 AFL-2.0 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 -mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~amd64 ~hppa ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" KERNEL_IUSE="kernel_linux kernel_FreeBSD" IUSE="acpi crypt debug dell disk-partition doc pcmcia selinux ${KERNEL_IUSE}" |