summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2007-04-20 23:22:33 +0000
committerDoug Goldstein <cardoe@gentoo.org>2007-04-20 23:22:33 +0000
commit90dec2a9ff97c29e030c4a51efd7e41ce7f928a7 (patch)
tree925ef5976e812b441559e850d4663ddd2837377f /sys-apps/hal/files
parentforgot to mask mythweb (diff)
downloadgentoo-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/files')
-rw-r--r--sys-apps/hal/files/0.5.9-hald.rc10
1 files changed, 7 insertions, 3 deletions
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