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

["William Hubbs (williamh)" <williamh@gentoo.org>]

williamh    12/10/31 23:43:01

  Modified:             openrc-9999.ebuild
  Log:
  consolidate the scripts to add to the runlevels for >=openrc-0.11.3
  
  (Portage version: 2.2.0_alpha142/cvs/Linux i686, signed Manifest commit with key 0x30C46538)

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

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

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- openrc-9999.ebuild	31 Oct 2012 22:47:31 -0000	1.113
+++ openrc-9999.ebuild	31 Oct 2012 23:43:01 -0000	1.114
@@ -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.113 2012/10/31 22:47:31 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.114 2012/10/31 23:43:01 williamh Exp $
 
 EAPI=4
 
@@ -240,7 +240,6 @@
 
 	if ! has_version ">=sys-apps/openrc-0.11"; then
 		add_boot_init sysfs sysinit
-		add_boot_init tmpfiles.setup boot
 	fi
 
 	# set default interactive shell to sulogin if it exists
@@ -248,7 +247,10 @@
 
 	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
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+		add_boot_init tmpfiles.setup boot
+	fi
 }
 
 # >=openrc-0.4.0 no longer loads the udev addon