| 1 |
cardoe 08/04/15 05:59:47 |
| 2 |
|
| 3 |
Added: openrc-0.2.1-respect-fastboot.patch |
| 4 |
openrc-0.2.1-no-deref-null.patch |
| 5 |
openrc-0.2.1-bad--help-output.patch |
| 6 |
openrc-0.2.1-openvz-support.patch |
| 7 |
Log: |
| 8 |
fix bug #216944 and other assorted issues |
| 9 |
(Portage version: 2.1.5_rc3) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 sys-apps/openrc/files/openrc-0.2.1-respect-fastboot.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/openrc-0.2.1-respect-fastboot.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/openrc-0.2.1-respect-fastboot.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: openrc-0.2.1-respect-fastboot.patch |
| 18 |
=================================================================== |
| 19 |
From: Roy Marples <roy@×××××××.name> |
| 20 |
Date: Wed, 9 Apr 2008 00:21:49 +0000 (+0100) |
| 21 |
Subject: Respect shutdown's fastboot. |
| 22 |
X-Git-Url: http://git.overlays.gentoo.org/gitweb/?p=proj%2Fopenrc.git;a=commitdiff_plain;h=a57e9df2a084350cf18a414b5d92e9fcc8aea6ae |
| 23 |
|
| 24 |
Respect shutdown's fastboot. |
| 25 |
--- |
| 26 |
|
| 27 |
diff --git a/init.d/fsck.in b/init.d/fsck.in |
| 28 |
index 5bf9ba8..f469ce8 100644 |
| 29 |
--- a/init.d/fsck.in |
| 30 |
+++ b/init.d/fsck.in |
| 31 |
@@ -29,6 +29,11 @@ start() |
| 32 |
{ |
| 33 |
local reboot_opts= fsck_opts= p= |
| 34 |
|
| 35 |
+ if [ -e /fastboot ]; then |
| 36 |
+ ewarn "Skipping fsck due to /fastboot" |
| 37 |
+ return 0 |
| 38 |
+ fi |
| 39 |
+ |
| 40 |
ebegin "Checking local filesystems" |
| 41 |
for p in ${fsck_passno}; do |
| 42 |
local IFS="${_IFS}" |
| 43 |
diff --git a/init.d/root.in b/init.d/root.in |
| 44 |
index c87b7f1..aba6415 100644 |
| 45 |
--- a/init.d/root.in |
| 46 |
+++ b/init.d/root.in |
| 47 |
@@ -13,7 +13,7 @@ depend() |
| 48 |
start() |
| 49 |
{ |
| 50 |
if echo 2>/dev/null >/.test.$$; then |
| 51 |
- rm -f /.test.$$ |
| 52 |
+ rm -f /.test.$$ /fastboot |
| 53 |
return 0 |
| 54 |
fi |
| 55 |
|
| 56 |
@@ -23,4 +23,5 @@ start() |
| 57 |
*) mount -u -o rw /;; |
| 58 |
esac |
| 59 |
eend $? "Root filesystem could not be mounted read/write" |
| 60 |
+ rm -f /fastboot |
| 61 |
} |
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
1.1 sys-apps/openrc/files/openrc-0.2.1-no-deref-null.patch |
| 66 |
|
| 67 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/openrc-0.2.1-no-deref-null.patch?rev=1.1&view=markup |
| 68 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/openrc-0.2.1-no-deref-null.patch?rev=1.1&content-type=text/plain |
| 69 |
|
| 70 |
Index: openrc-0.2.1-no-deref-null.patch |
| 71 |
=================================================================== |
| 72 |
From: DragonK <dragonk@×××××.com> |
| 73 |
Date: Sun, 6 Apr 2008 13:21:42 +0000 (+0100) |
| 74 |
Subject: p could be null here. |
| 75 |
X-Git-Url: http://git.overlays.gentoo.org/gitweb/?p=proj%2Fopenrc.git;a=commitdiff_plain;h=f183081181319271bad39cb00ff2970dc4a4ae42 |
| 76 |
|
| 77 |
p could be null here. |
| 78 |
--- |
| 79 |
|
| 80 |
diff --git a/src/rc/rc-applets.c b/src/rc/rc-applets.c |
| 81 |
index 70f3a04..d434be4 100644 |
| 82 |
--- a/src/rc/rc-applets.c |
| 83 |
+++ b/src/rc/rc-applets.c |
| 84 |
@@ -110,7 +110,7 @@ static int do_e(int argc, char **argv) |
| 85 |
} else if (strcmp(applet, "esyslog") == 0 || |
| 86 |
strcmp(applet, "elog") == 0) { |
| 87 |
p = strchr(argv[0], '.'); |
| 88 |
- if ((level = syslog_decode(p + 1, prioritynames)) == -1) |
| 89 |
+ if (!p || (level = syslog_decode(p + 1, prioritynames)) == -1) |
| 90 |
eerrorx("%s: invalid log level `%s'", applet, argv[0]); |
| 91 |
|
| 92 |
if (argc < 3) |
| 93 |
|
| 94 |
|
| 95 |
|
| 96 |
1.1 sys-apps/openrc/files/openrc-0.2.1-bad--help-output.patch |
| 97 |
|
| 98 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/openrc-0.2.1-bad--help-output.patch?rev=1.1&view=markup |
| 99 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/openrc-0.2.1-bad--help-output.patch?rev=1.1&content-type=text/plain |
| 100 |
|
| 101 |
Index: openrc-0.2.1-bad--help-output.patch |
| 102 |
=================================================================== |
| 103 |
From: Roy Marples <roy@×××××××.name> |
| 104 |
Date: Mon, 7 Apr 2008 11:48:32 +0000 (+0100) |
| 105 |
Subject: Fix rc-service --help output. |
| 106 |
X-Git-Url: http://git.overlays.gentoo.org/gitweb/?p=proj%2Fopenrc.git;a=commitdiff_plain;h=71faee1761a57203386a7f0540cc19f5de10faa7 |
| 107 |
|
| 108 |
Fix rc-service --help output. |
| 109 |
--- |
| 110 |
|
| 111 |
diff --git a/src/rc/rc-service.c b/src/rc/rc-service.c |
| 112 |
index 5c6fc3d..bcbf3db 100644 |
| 113 |
--- a/src/rc/rc-service.c |
| 114 |
+++ b/src/rc/rc-service.c |
| 115 |
@@ -51,6 +51,7 @@ static const struct option longopts[] = { |
| 116 |
longopts_COMMON |
| 117 |
}; |
| 118 |
static const char * const longopts_help[] = { |
| 119 |
+ "tests if the service exists or not", |
| 120 |
"list all available services", |
| 121 |
longopts_help_COMMON |
| 122 |
}; |
| 123 |
|
| 124 |
|
| 125 |
|
| 126 |
1.1 sys-apps/openrc/files/openrc-0.2.1-openvz-support.patch |
| 127 |
|
| 128 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/openrc-0.2.1-openvz-support.patch?rev=1.1&view=markup |
| 129 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/openrc-0.2.1-openvz-support.patch?rev=1.1&content-type=text/plain |
| 130 |
|
| 131 |
Index: openrc-0.2.1-openvz-support.patch |
| 132 |
=================================================================== |
| 133 |
From: Roy Marples <roy@×××××××.name> |
| 134 |
Date: Sun, 6 Apr 2008 20:06:07 +0000 (+0100) |
| 135 |
Subject: Some systems are only detectable after /proc is mounted, so re-test if unknown. |
| 136 |
X-Git-Url: http://git.overlays.gentoo.org/gitweb/?p=proj%2Fopenrc.git;a=commitdiff_plain;h=6a670fe8314be48994cbe1603312015a549f0e94 |
| 137 |
|
| 138 |
Some systems are only detectable after /proc is mounted, so re-test if unknown. |
| 139 |
--- |
| 140 |
|
| 141 |
diff --git a/sh/init.sh.Linux.in b/sh/init.sh.Linux.in |
| 142 |
index 25a3ecb..5aa5031 100644 |
| 143 |
--- a/sh/init.sh.Linux.in |
| 144 |
+++ b/sh/init.sh.Linux.in |
| 145 |
@@ -96,6 +96,9 @@ if ${mountproc}; then |
| 146 |
fi |
| 147 |
unset mountproc |
| 148 |
|
| 149 |
+# Re-load RC_SYS if empty now we have /proc mounted |
| 150 |
+[ -z "${RC_SYS}" ] && export RC_SYS="$(rc --sys)" |
| 151 |
+ |
| 152 |
# Read off the kernel commandline to see if there's any special settings |
| 153 |
# especially check to see if we need to set the CDBOOT environment variable |
| 154 |
# Note: /proc MUST be mounted |
| 155 |
diff --git a/src/rc/rc.c b/src/rc/rc.c |
| 156 |
index b305b2d..5ae7e1f 100644 |
| 157 |
--- a/src/rc/rc.c |
| 158 |
+++ b/src/rc/rc.c |
| 159 |
@@ -935,11 +935,13 @@ static void handle_bad_signal(int sig) |
| 160 |
static const struct option longopts[] = { |
| 161 |
{ "override", 1, NULL, 'o' }, |
| 162 |
{ "service", 1, NULL, 's' }, |
| 163 |
+ { "sys", 0, NULL, 'S' }, |
| 164 |
longopts_COMMON |
| 165 |
}; |
| 166 |
static const char * const longopts_help[] = { |
| 167 |
"override the next runlevel to change into\nwhen leaving single user or boot runlevels", |
| 168 |
"runs the service specified with the rest\nof the arguments", |
| 169 |
+ "output the RC system type, if any", |
| 170 |
longopts_help_COMMON |
| 171 |
}; |
| 172 |
#include "_usage.c" |
| 173 |
@@ -1028,6 +1030,12 @@ int main(int argc, char **argv) |
| 174 |
execv(*argv, argv); |
| 175 |
eerrorx("%s: %s", applet, strerror(errno)); |
| 176 |
/* NOTREACHED */ |
| 177 |
+ case 'S': |
| 178 |
+ bootlevel = rc_sys(); |
| 179 |
+ if (bootlevel) |
| 180 |
+ printf("%s\n", bootlevel); |
| 181 |
+ exit(EXIT_SUCCESS); |
| 182 |
+ /* NOTREACHED */ |
| 183 |
case_RC_COMMON_GETOPT |
| 184 |
} |
| 185 |
} |
| 186 |
|
| 187 |
|
| 188 |
|
| 189 |
-- |
| 190 |
gentoo-commits@l.g.o mailing list |
Archives