Gentoo Archives: gentoo-commits

From: "William Hubbs (williamh)" <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild
Date: Wed, 31 Oct 2012 23:43:17
Message-Id: 20121031234301.86C4221602@flycatcher.gentoo.org
1 williamh 12/10/31 23:43:01
2
3 Modified: openrc-9999.ebuild
4 Log:
5 consolidate the scripts to add to the runlevels for >=openrc-0.11.3
6
7 (Portage version: 2.2.0_alpha142/cvs/Linux i686, signed Manifest commit with key 0x30C46538)
8
9 Revision Changes Path
10 1.114 sys-apps/openrc/openrc-9999.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.114&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.114&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.113&r2=1.114
15
16 Index: openrc-9999.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
19 retrieving revision 1.113
20 retrieving revision 1.114
21 diff -u -r1.113 -r1.114
22 --- openrc-9999.ebuild 31 Oct 2012 22:47:31 -0000 1.113
23 +++ openrc-9999.ebuild 31 Oct 2012 23:43:01 -0000 1.114
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2012 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.113 2012/10/31 22:47:31 williamh Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.114 2012/10/31 23:43:01 williamh Exp $
29
30 EAPI=4
31
32 @@ -240,7 +240,6 @@
33
34 if ! has_version ">=sys-apps/openrc-0.11"; then
35 add_boot_init sysfs sysinit
36 - add_boot_init tmpfiles.setup boot
37 fi
38
39 # set default interactive shell to sulogin if it exists
40 @@ -248,7 +247,10 @@
41
42 has_version sys-apps/openrc || migrate_from_baselayout_1
43 has_version ">=sys-apps/openrc-0.4.0" || migrate_udev_init_script
44 - has_version ">=sys-apps/openrc-0.11.3" || migrate_udev_mount_script
45 + if ! has_version ">=sys-apps/openrc-0.11.3" ; then
46 + migrate_udev_mount_script
47 + add_boot_init tmpfiles.setup boot
48 + fi
49 }
50
51 # >=openrc-0.4.0 no longer loads the udev addon