[gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild

[William Hubbs (williamh)]

williamh    12/10/31 22:47:31

  Modified:             openrc-9999.ebuild
  Log:
  Add tmpfiles.setup to the boot runlevel and udev-mount to the sysinit runlevel.
  
  (Portage version: 2.2.0_alpha142/cvs/Linux i686, signed Manifest commit with key 0x30C46538)

Revision  Changes    Path
1.113                sys-apps/openrc/openrc-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.113&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.113&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.112&r2=1.113

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- openrc-9999.ebuild	31 Oct 2012 17:39:52 -0000	1.112
+++ openrc-9999.ebuild	31 Oct 2012 22:47:31 -0000	1.113
@@ -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 @@
 
 	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 @@
 
 	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 @@
 	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