summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2012-10-31 22:47:41 +0000
committerWilliam Hubbs <williamh@gentoo.org>2012-10-31 22:47:41 +0000
commit736ab7af6fb733c6a4dad24e40bc8bb30c17741f (patch)
tree964975b036515ca3f09392f936eca86d551b6b8d /sys-apps
parentMask x11-apps/grandr for removal. (diff)
downloadhistorical-736ab7af6fb733c6a4dad24e40bc8bb30c17741f.tar.gz
historical-736ab7af6fb733c6a4dad24e40bc8bb30c17741f.tar.bz2
historical-736ab7af6fb733c6a4dad24e40bc8bb30c17741f.zip
Add tmpfiles.setup to the boot runlevel and udev-mount to the sysinit runlevel.
Package-Manager: portage-2.2.0_alpha142/cvs/Linux i686 Manifest-Sign-Key: 0x30C46538
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/openrc/Manifest8
-rw-r--r--sys-apps/openrc/openrc-9999.ebuild15
2 files changed, 16 insertions, 7 deletions
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 37996d9e8a18..1b831b038b73 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -15,13 +15,13 @@ EBUILD openrc-0.10.4.ebuild 14421 SHA256 13d881943711b9f5dcf7ffc70af7c5fc2d51fd2
EBUILD openrc-0.10.5.ebuild 14421 SHA256 a3de4203ca5221570a679db74083198b03a6a6a5439788a5fda0ed2452e99bf4 SHA512 17c342ef9f3bd8be978fbec3425cebb78c3c5ac262b121bec69ebb01f0c8ddc2d07d033d6a29f37df2de13935b811c251e862be9a41ae07f3423d229ecaa9b2d WHIRLPOOL 25e1144188ab066ddc42015c52a5bff55d0d2a499918debc4e614606bb8809b2de294574116e0290a609f5afef453a2ed537207379c06c23d11dc58e43fcbc8b
EBUILD openrc-0.11.2.ebuild 15901 SHA256 6efd17f78630ba6b7760ec87137d9a1b483ea5fa9b7e99bddc9456cc2af944de SHA512 fc7bd27a60cd061399e0f74be7954d6ce46fecce75c2b685a5e811b14ebe44b148a27d5612fb20fb66507e59bec49901b0c5381a38cfd8fe4b5d9b48c1a07586 WHIRLPOOL 19ba7195b278f2fd15dedbc8f7f33383e34388f104204b95689e71f50963efa555c9f858dbc4777ba94ccd304e8d5a402af593e5452135bd6faf6b07a5873a1d
EBUILD openrc-0.9.8.4.ebuild 13967 SHA256 dd100aaaf00fe0f46008cda1a0b12a6753bd6019cb606d747f0edefc7b359468 SHA512 6a958bea4c0cc6f9adcdba07a2c193e04aaa48f39a5d27329a5ede5d1be97fb967e96751d1450c9ac60b3e194445f9422892865fd7f53d6c2d540c17624d4f2f WHIRLPOOL 62bc0da6afa4b5b9a7f52678b727e489c540c82d0dec2ad503e1fb84ce4f3dc357f7f9ad81cdb99216fef1d156b467e2e3ad0cdde52d360d0924ac7caa019ad4
-EBUILD openrc-9999.ebuild 15901 SHA256 b1cc7fd7f178af64e6819a29ffd9c7d716a5ff9f18f10e12c6dd4116a0b1c361 SHA512 56c31f466209b0e0627db4bee2a35dbb5ac4609ce77734b65cd6b4bfe839a65d9de357e5bc61948f5c4f582fe18744b57c01f45eceef0382d5a544c0d6a35cf6 WHIRLPOOL 29be908d23f87032d8378235c905a59f267a1cae64c8592f45faf7fbaea58147b7b32e59c4219e686bee1df8eb6d1233bdd26e42b74132cfa844627df6aba478
+EBUILD openrc-9999.ebuild 16200 SHA256 3377010017a195d19402d0f6a03c7713aec7de34ba8f413abd0a4752d9e09943 SHA512 243ee647b425465e5f2e6be0a59748fd98ef664e3884eab6777cf447552d94640fc93619ed66138964946efb2c5839156afef49a2cef15e2dc90c69f6a7c333f WHIRLPOOL 6b1c82a101abed2f4c5076d2509332980ff818bb5fe7e4dd96f4c59e82f57075010f0f214ed9b41d4f4c15a7b5cfab1e0b4cd24bdeb10b9f70ff3356d6bc2d6b
MISC ChangeLog 40718 SHA256 a5acf9bc46a780b1eacbe06540ec9bfde109edfceb19bcefeba3eb644b35bd30 SHA512 5b1e04d823148ae71401cf75545c37cea7ed2c7e1b43e5c979191b43655b2043ccbd22216d5eff86a3e0b18dcc85a6036b2245e2df8e44b695553bbf6a2b606b WHIRLPOOL 04c1e3e39c5950f78262cd62a40803864322b4a2ce3a1b39e3c267654c953b147c0772e420bf5bfbe0add90b06cde9060f7dfc25aada433d34a3ca232f4e46db
MISC metadata.xml 248 SHA256 1e50acb4e0c7b890089cafec26f902ce9b4c06a877905618aee0f020da8ae8cc SHA512 e71772c01a76d089da16f089a8ca01cc3356d0d0a97d804b996c4f215009eefe06bd2770ff23bb98a29820d0dca55f434e1e99f963357309c2f1813a5420f121 WHIRLPOOL ca0cc96027f581e2b671a3f00ba549204d999cfc93d3837be38ea7023222ed212cf786b4a50174087a64bcf284825751f44a99f228887222944c73f9d6940333
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlCRYnMACgkQblQW9DDEZTj9vwCfZdFqtFPsIwuO+lF6OXmteL6T
-7+MAnRHPRCphvTAtffDsxjCdJHfKeeeg
-=IJGO
+iEYEAREIAAYFAlCRqo0ACgkQblQW9DDEZTh1dwCgiH/ZuW79T1O6pNJ5UJ19kD8D
+tT0An0VyxHUYZSAO09mqW3yuSngNYZ0t
+=vTbo
-----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 18af3155c4f3..bc7bc79f3269 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.112 2012/10/31 17:39:52 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.113 2012/10/31 22:47:31 williamh Exp $
EAPI=4
@@ -240,8 +240,7 @@ pkg_preinst() {
if ! has_version ">=sys-apps/openrc-0.11"; then
add_boot_init sysfs sysinit
- add_boot_init tmpfilesd.sysinit sysinit
- add_boot_init tmpfilesd.boot boot
+ add_boot_init tmpfiles.setup boot
fi
# set default interactive shell to sulogin if it exists
@@ -249,6 +248,7 @@ pkg_preinst() {
has_version sys-apps/openrc || migrate_from_baselayout_1
has_version ">=sys-apps/openrc-0.4.0" || migrate_udev_init_script
+ has_version ">=sys-apps/openrc-0.11.3" || migrate_udev_mount_script
}
# >=openrc-0.4.0 no longer loads the udev addon
@@ -272,6 +272,15 @@ migrate_udev_init_script() {
fi
}
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+ if [ -e "${EROOT}"/etc/runlevels/sysinit/udev -a \
+ ! -e "${EROOT}"/etc/runlevels/sysinit/udev-mount ]; then
+ add_boot_init udev-mount sysinit
+ fi
+ return 0
+}
+
migrate_from_baselayout_1() {
# baselayout boot init scripts have been split out
for f in $(cd "${ED}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do