init script tweak to require /dev/root

Package-Manager: portage-2.1.2.4

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index b2096d6085032df52befae4a4b81df3949bbd8d2..418e81eb233acd03b39f7925f967fcb0d1c28baa 100644 (file)
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,9 @@
 # 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.171 2007/04/18 20:58:29 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.172 2007/04/19 16:34:58 cardoe Exp $
+
+  19 Apr 2007; Doug Goldstein <cardoe@gentoo.org> files/0.5.9-hald.rc:
+  init script tweak to require /dev/root
 
   18 Apr 2007; Doug Goldstein <cardoe@gentoo.org>
   files/0.5.9/97_ignore_fixed_drives.patch:

diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 8ff77d5e64484d799157e94808c9796ec1a02e86..e42b627f3dcb4beef9e95dc1f03544ad8b9af6e4 100644 (file)
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -9,10 +9,10 @@ AUX 0.5.9-hald.conf 364 RMD160 4c54ac942ecc130a585e90d07078372bfc3b5d58 SHA1 ff2
 MD5 daa36e163190cfec256b83e348ba012f files/0.5.9-hald.conf 364
 RMD160 4c54ac942ecc130a585e90d07078372bfc3b5d58 files/0.5.9-hald.conf 364
 SHA256 efc215155f79947827735972eb97a8a460de5084c74811da615292132888d707 files/0.5.9-hald.conf 364
-AUX 0.5.9-hald.rc 762 RMD160 fe4a59c00cda2ca2233d2768520b848a3a0a1091 SHA1 47d7c7682246ed0beb0875f32881d33748fb98d4 SHA256 5807d0529d660e651a55c0451702cd6eebb81fec7a111c33a64b6d370d18e7f2
-MD5 ee489c8ee24ea47743ea517eb8b6a789 files/0.5.9-hald.rc 762
-RMD160 fe4a59c00cda2ca2233d2768520b848a3a0a1091 files/0.5.9-hald.rc 762
-SHA256 5807d0529d660e651a55c0451702cd6eebb81fec7a111c33a64b6d370d18e7f2 files/0.5.9-hald.rc 762
+AUX 0.5.9-hald.rc 937 RMD160 56f390380986d653ff723228e418ca2f6e8b92ad SHA1 b913a04e7909ee227518b25d351228ac4e00d2fd SHA256 e600e26b44150563c2d2a777d4a96254ef834ecc1e56b05661d88d4c89efc29c
+MD5 b75bf2b15b661d1730417e186862b9df files/0.5.9-hald.rc 937
+RMD160 56f390380986d653ff723228e418ca2f6e8b92ad files/0.5.9-hald.rc 937
+SHA256 e600e26b44150563c2d2a777d4a96254ef834ecc1e56b05661d88d4c89efc29c files/0.5.9-hald.rc 937
 AUX 0.5.9/01_luks_mount_fix.patch 2605 RMD160 00d6b01a0c96123ce6ee66d1762a00988c363139 SHA1 d5b0ce4140b0db59942ef384df640a4749b0c24c SHA256 f1dfdd118055efbc97163273e0f3930f8badf2be3e4f1ca327654c221faa951e
 MD5 526e8c9b50700bca6340f6a0d73f1aa4 files/0.5.9/01_luks_mount_fix.patch 2605
 RMD160 00d6b01a0c96123ce6ee66d1762a00988c363139 files/0.5.9/01_luks_mount_fix.patch 2605
@@ -187,10 +187,10 @@ EBUILD hal-0.5.9.ebuild 7193 RMD160 a36f201410e369b8a939876bd13662c23df1a638 SHA
 MD5 490583431bbaa7a9e38de2c1c0a89100 hal-0.5.9.ebuild 7193
 RMD160 a36f201410e369b8a939876bd13662c23df1a638 hal-0.5.9.ebuild 7193
 SHA256 7559e53b5a730ce8c819bd3c424311ef66bde22b1e54cbeb9b7844862f99cd04 hal-0.5.9.ebuild 7193
-MISC ChangeLog 28091 RMD160 6886717e06c1167975f88ece75f5eeefad1f03d1 SHA1 d9f841549ffd255542d0e86557ba50ee784df950 SHA256 7b557a408881f90ed102c88b0aa9a7453e01adc55dc48d423a2b6a9febfd9256
-MD5 c9cc0c06352cab461c4c6a4db974cd14 ChangeLog 28091
-RMD160 6886717e06c1167975f88ece75f5eeefad1f03d1 ChangeLog 28091
-SHA256 7b557a408881f90ed102c88b0aa9a7453e01adc55dc48d423a2b6a9febfd9256 ChangeLog 28091
+MISC ChangeLog 28204 RMD160 9fa1c2bf5d0533873c8a83eaf0c1bfb48a6a928e SHA1 ad1cc37fd9309a3ef26bc7b15d033e9be95b39ec SHA256 22a7ea31a0cd88867756db83b621f4a16b4790def8777fb3733a9e9ea05056f5
+MD5 f1c6fb545249aac6a2b31cd7c4f222dc ChangeLog 28204
+RMD160 9fa1c2bf5d0533873c8a83eaf0c1bfb48a6a928e ChangeLog 28204
+SHA256 22a7ea31a0cd88867756db83b621f4a16b4790def8777fb3733a9e9ea05056f5 ChangeLog 28204
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
 MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345
 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345
@@ -207,7 +207,7 @@ SHA256 d862b002c9a5547954874b2a0cbadd614381d085e850539e6aef2dd9e9d52dfe files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGJoY8oeSe8B0zEfwRAkDFAJsHJz7oQ1AzNbSFQGOZ96HkG2rqDACeLWpD
-yNOS/f8G5Tqla57BhxwkOFo=
-=9sYC
+iD8DBQFGJ5nloeSe8B0zEfwRAkslAJ4sBL2OBdISgX+1AWYjxPMr9vyHrgCeMzh7
+sljxZmp9TGTiMMW3RqIsmLc=
+=cyHy
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/hal/files/0.5.9-hald.rc b/sys-apps/hal/files/0.5.9-hald.rc
index 8da96f15da42d73e9ca9ae64ff4fe655626c0067..4f4dac10b1bb97e26096bc48fba86e30064ac4ec 100644 (file)
--- 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.4 2007/04/17 16:26:30 cardoe Exp $
+# $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 $
 
 depend() {
        need dbus
@@ -13,6 +13,12 @@ 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 /"
+               echo "See http://bugs.gentoo.org/show_bug.cgi?id=175243"
+               eend 2
+       fi
+
        if [ -f /proc/acpi/event ]; then
                chgrp haldaemon /proc/acpi/event
                chmod 440 /proc/acpi/event