From 9c7aa91fc5748df2fbf2deb6690b97554a8aac08 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Tue, 10 Apr 2007 00:38:16 +0000 Subject: [PATCH] New idea with regard to the initscript using consolekit with RC_NEED. Package-Manager: portage-2.1.2.3 --- sys-apps/hal/Manifest | 26 +++++++++++++++----------- sys-apps/hal/files/0.5.9-hald.conf | 6 ++++++ sys-apps/hal/files/0.5.9-hald.rc | 4 ++-- sys-apps/hal/hal-0.5.9.ebuild | 8 +++++++- 4 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 sys-apps/hal/files/0.5.9-hald.conf diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest index a05277d6db00..f2927ddbf6ed 100644 --- a/sys-apps/hal/Manifest +++ b/sys-apps/hal/Manifest @@ -5,10 +5,14 @@ AUX 0.5-hald.rc 681 RMD160 f94d4a6e4ffb3beb84eeeb8e25564fa566ecc493 SHA1 fe413a8 MD5 facf81eeca7ebddff5d030acb36de31d files/0.5-hald.rc 681 RMD160 f94d4a6e4ffb3beb84eeeb8e25564fa566ecc493 files/0.5-hald.rc 681 SHA256 802f83998c50a3e030d1db2f5a8364e4bb10eebecd464683445d63cf56702161 files/0.5-hald.rc 681 -AUX 0.5.9-hald.rc 700 RMD160 3fa0a991056eb872f9dd044998315fcbf0052745 SHA1 f640c31dd3974f0348e8ecaccff3bdac4426b693 SHA256 ca1995a88a7540ffbdc67ec9098cf946f3a284880e467aaa0220c618e4a117b3 -MD5 3b00116a452b7b02f790e49249211a0e files/0.5.9-hald.rc 700 -RMD160 3fa0a991056eb872f9dd044998315fcbf0052745 files/0.5.9-hald.rc 700 -SHA256 ca1995a88a7540ffbdc67ec9098cf946f3a284880e467aaa0220c618e4a117b3 files/0.5.9-hald.rc 700 +AUX 0.5.9-hald.conf 271 RMD160 8e8d879246b9c2c117287c6eb9b065d94301b774 SHA1 d25f8f7e4a0d7def2626d19b70627b754f0bae3f SHA256 68a6224f3e72325850f6ac93369dae766199da9c6cbae471a3868087e0b431be +MD5 2720cff2a57dd5fa80fc60ab7ca37fc0 files/0.5.9-hald.conf 271 +RMD160 8e8d879246b9c2c117287c6eb9b065d94301b774 files/0.5.9-hald.conf 271 +SHA256 68a6224f3e72325850f6ac93369dae766199da9c6cbae471a3868087e0b431be files/0.5.9-hald.conf 271 +AUX 0.5.9-hald.rc 689 RMD160 b0ee69b9c0f77c3cd2768e685aeebe1fcd1f3aa7 SHA1 b5175808f1e7c33394f9df8466f5f7e176fed6e9 SHA256 16d88a37dc9bbfed732d22990f7ea13c58173552bbccdd1452c36ab947ff0d28 +MD5 76b31e84dfc74511d3fdc0b9c38e8321 files/0.5.9-hald.rc 689 +RMD160 b0ee69b9c0f77c3cd2768e685aeebe1fcd1f3aa7 files/0.5.9-hald.rc 689 +SHA256 16d88a37dc9bbfed732d22990f7ea13c58173552bbccdd1452c36ab947ff0d28 files/0.5.9-hald.rc 689 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 @@ -147,10 +151,10 @@ EBUILD hal-0.5.7.1-r5.ebuild 6426 RMD160 ba28bce7126639c77de28ac2fc8d233475bb498 MD5 709ca20b11819f2e13e381be47e19535 hal-0.5.7.1-r5.ebuild 6426 RMD160 ba28bce7126639c77de28ac2fc8d233475bb498e hal-0.5.7.1-r5.ebuild 6426 SHA256 6e020d3a29d82b993984f58ab8ef3659d837c11bce25f3ad25df6f4748e11207 hal-0.5.7.1-r5.ebuild 6426 -EBUILD hal-0.5.9.ebuild 6065 RMD160 d6370e8a09e33bfbe77f8912185e79ef84c281a4 SHA1 f5330383b89efb8aafe86c7b9b464d51c569fa8c SHA256 131f9a3bc8a9d03726a496283fa386b78bd31051b4ad447d554774e1d27a128e -MD5 4c5c6993a56e1616c1bb172e7029b201 hal-0.5.9.ebuild 6065 -RMD160 d6370e8a09e33bfbe77f8912185e79ef84c281a4 hal-0.5.9.ebuild 6065 -SHA256 131f9a3bc8a9d03726a496283fa386b78bd31051b4ad447d554774e1d27a128e hal-0.5.9.ebuild 6065 +EBUILD hal-0.5.9.ebuild 6254 RMD160 766b5842212f2ca89bf479a62bbd2b797912ef5e SHA1 af2bd1d9a1063ae0b6fa42e893157ad55635a343 SHA256 a813e12fb36ada25e214c5c3dc29305ed26071b2cf8b36f8b07bef0e8433f30a +MD5 6b23c6bcc664110102d6ac65bbb8dbdf hal-0.5.9.ebuild 6254 +RMD160 766b5842212f2ca89bf479a62bbd2b797912ef5e hal-0.5.9.ebuild 6254 +SHA256 a813e12fb36ada25e214c5c3dc29305ed26071b2cf8b36f8b07bef0e8433f30a hal-0.5.9.ebuild 6254 MISC ChangeLog 24402 RMD160 2ed788dbccba2265efbb94b2c9f245c72d57ec24 SHA1 aba2928bff497596039f7c26a35543da48f1a785 SHA256 dab5fe8c4ec746350f1e4b49716ec91ae2704c6eef5a79e60ddd55afe7ae0b85 MD5 51afc512100321ffd2046539a552bb3e ChangeLog 24402 RMD160 2ed788dbccba2265efbb94b2c9f245c72d57ec24 ChangeLog 24402 @@ -171,7 +175,7 @@ SHA256 d862b002c9a5547954874b2a0cbadd614381d085e850539e6aef2dd9e9d52dfe files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGGrM9oeSe8B0zEfwRAsTZAJ4iShkmqipnsCv4UOqbKOYbQIn4jgCeJTgr -OImypSZRIOwle0cDQ4rMSuk= -=T5kN +iD8DBQFGGtx4oeSe8B0zEfwRAtdpAJ9/qYNVxnrejsnuND9Yc/UiN557uQCePOS9 +vqlqh8KCZPLkkspNMwxrPho= +=MUrG -----END PGP SIGNATURE----- diff --git a/sys-apps/hal/files/0.5.9-hald.conf b/sys-apps/hal/files/0.5.9-hald.conf new file mode 100644 index 000000000000..2578065b236d --- /dev/null +++ b/sys-apps/hal/files/0.5.9-hald.conf @@ -0,0 +1,6 @@ +#The setting below controls the need for ConsoleKit +#This fixes the problem of requiring people to do +#rc-update add consolekit default since people +#forget or don't read ewarn and then complain their system is broken +#ONCE AGAIN DO NOT TOUCH THE LINE BELOW THIS +RC_NEED diff --git a/sys-apps/hal/files/0.5.9-hald.rc b/sys-apps/hal/files/0.5.9-hald.rc index 68502b68cbc6..37f8944f55d7 100644 --- a/sys-apps/hal/files/0.5.9-hald.rc +++ b/sys-apps/hal/files/0.5.9-hald.rc @@ -1,11 +1,11 @@ #!/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.2 2007/04/06 16:44:41 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/files/0.5.9-hald.rc,v 1.3 2007/04/10 00:38:16 cardoe Exp $ depend() { need dbus - use logger consolekit acpid + use logger acpid after coldplug dns nscd } diff --git a/sys-apps/hal/hal-0.5.9.ebuild b/sys-apps/hal/hal-0.5.9.ebuild index 6e5523a1edf5..ac306c51c46f 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.12 2007/04/09 21:42:25 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.ebuild,v 1.13 2007/04/10 00:38:16 cardoe Exp $ inherit eutils linux-info autotools flag-o-matic @@ -161,6 +161,12 @@ src_install() { # initscript newinitd "${FILESDIR}"/0.5.9-hald.rc hald + newconfd "${FILESDIR}"/0.5.9-hald.conf hald + if use pam; then + sed -e 's:RC_NEED:RC_NEED="consolekit":' -i /etc/conf.d/hald + else + sed -e 's:RC_NEED:RC_NEED="":' -i /etc/conf.d/hald + fi # We now create and keep /media here as both gnome-mount and pmount # use these directories, to avoid collision. -- 2.26.2