1 |
cardoe 08/10/06 18:53:14 |
2 |
|
3 |
Modified: 0002-useful-functions.patch |
4 |
Log: |
5 |
create 0.2.5 patch directory and copy current patches there. Use that directory for 0.2.5. Update live ebuild 0002 patch to current patch as the original one doesn't apply. bug #238904. Remove outdated versions. |
6 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.3 sys-apps/openrc/files/9999/0002-useful-functions.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/9999/0002-useful-functions.patch?rev=1.3&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/9999/0002-useful-functions.patch?rev=1.3&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/9999/0002-useful-functions.patch?r1=1.2&r2=1.3 |
14 |
|
15 |
Index: 0002-useful-functions.patch |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/files/9999/0002-useful-functions.patch,v |
18 |
retrieving revision 1.2 |
19 |
retrieving revision 1.3 |
20 |
diff -u -r1.2 -r1.3 |
21 |
--- 0002-useful-functions.patch 16 Apr 2008 17:50:16 -0000 1.2 |
22 |
+++ 0002-useful-functions.patch 6 Oct 2008 18:53:13 -0000 1.3 |
23 |
@@ -1,19 +1,19 @@ |
24 |
-From c5552432d21e964ea1dbda7415040259b87ea77e Mon Sep 17 00:00:00 2001 |
25 |
+From 79e8ce8d2ea0ede99aba18d5f9a625a110aa918f Mon Sep 17 00:00:00 2001 |
26 |
From: Mike Frysinger <vapier@g.o> |
27 |
Date: Mon, 24 Mar 2008 02:03:39 -0400 |
28 |
Subject: [PATCH] add a softlevel() function to the API so people dont have to worry about inner details and move get_bootparam back to the exported function.sh api |
29 |
|
30 |
--- |
31 |
- sh/functions.sh.in | 27 +++++++++++++++++++++++++++ |
32 |
- sh/rc-functions.sh.in | 22 ---------------------- |
33 |
- 2 files changed, 27 insertions(+), 22 deletions(-) |
34 |
+ sh/functions.sh.in | 22 ++++++++++++++++++++++ |
35 |
+ sh/rc-functions.sh.in | 23 ----------------------- |
36 |
+ 2 files changed, 22 insertions(+), 23 deletions(-) |
37 |
|
38 |
diff --git a/sh/functions.sh.in b/sh/functions.sh.in |
39 |
-index 1a1fbba..140f6dc 100644 |
40 |
+index 57917ed..680f534 100644 |
41 |
--- a/sh/functions.sh.in |
42 |
+++ b/sh/functions.sh.in |
43 |
-@@ -38,6 +38,28 @@ yesno() |
44 |
- esac |
45 |
+@@ -42,6 +42,28 @@ rc_runlevel() { |
46 |
+ rc-status --runlevel |
47 |
} |
48 |
|
49 |
+get_bootparam() |
50 |
@@ -42,10 +42,10 @@ |
51 |
{ |
52 |
local IFS=":" p= path= |
53 |
diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in |
54 |
-index 74db71e..eb45e49 100644 |
55 |
+index 751d47a..c713def 100644 |
56 |
--- a/sh/rc-functions.sh.in |
57 |
+++ b/sh/rc-functions.sh.in |
58 |
-@@ -51,28 +51,6 @@ is_union_fs() |
59 |
+@@ -51,29 +51,6 @@ is_union_fs() |
60 |
unionctl "$1" --list >/dev/null 2>&1 |
61 |
} |
62 |
|
63 |
@@ -56,6 +56,7 @@ |
64 |
- |
65 |
- set -- $(cat /proc/cmdline) |
66 |
- while [ -n "$1" ]; do |
67 |
+- [ "$1" = "${match}" ] && return 0 |
68 |
- case "$1" in |
69 |
- gentoo=*) |
70 |
- local params="${1##*=}" |
71 |
@@ -73,7 +74,7 @@ |
72 |
- |
73 |
# Add our sbin to $PATH |
74 |
case "${PATH}" in |
75 |
- @PREFIX@/lib/rc/sbin|@PREFIX@/lib/rc/sbin:*);; |
76 |
+ "${RC_LIBDIR}"/sbin|"${RC_LIBDIR}"/sbin:*);; |
77 |
-- |
78 |
-1.5.4.4 |
79 |
+1.6.0.2 |