* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc/files: openrc-0.2.1-respect-fastboot.patch openrc-0.2.1-no-deref-null.patch openrc-0.2.1-bad--help-output.patch openrc-0.2.1-openvz-support.patch
@ 2008-04-15 5:59 Doug Goldstein (cardoe)
0 siblings, 0 replies; only message in thread
From: Doug Goldstein (cardoe) @ 2008-04-15 5:59 UTC (permalink / raw
To: gentoo-commits
cardoe 08/04/15 05:59:47
Added: openrc-0.2.1-respect-fastboot.patch
openrc-0.2.1-no-deref-null.patch
openrc-0.2.1-bad--help-output.patch
openrc-0.2.1-openvz-support.patch
Log:
fix bug #216944 and other assorted issues
(Portage version: 2.1.5_rc3)
Revision Changes Path
1.1 sys-apps/openrc/files/openrc-0.2.1-respect-fastboot.patch
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
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
Index: openrc-0.2.1-respect-fastboot.patch
===================================================================
From: Roy Marples <roy@marples.name>
Date: Wed, 9 Apr 2008 00:21:49 +0000 (+0100)
Subject: Respect shutdown's fastboot.
X-Git-Url: http://git.overlays.gentoo.org/gitweb/?p=proj%2Fopenrc.git;a=commitdiff_plain;h=a57e9df2a084350cf18a414b5d92e9fcc8aea6ae
Respect shutdown's fastboot.
---
diff --git a/init.d/fsck.in b/init.d/fsck.in
index 5bf9ba8..f469ce8 100644
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -29,6 +29,11 @@ start()
{
local reboot_opts= fsck_opts= p=
+ if [ -e /fastboot ]; then
+ ewarn "Skipping fsck due to /fastboot"
+ return 0
+ fi
+
ebegin "Checking local filesystems"
for p in ${fsck_passno}; do
local IFS="${_IFS}"
diff --git a/init.d/root.in b/init.d/root.in
index c87b7f1..aba6415 100644
--- a/init.d/root.in
+++ b/init.d/root.in
@@ -13,7 +13,7 @@ depend()
start()
{
if echo 2>/dev/null >/.test.$$; then
- rm -f /.test.$$
+ rm -f /.test.$$ /fastboot
return 0
fi
@@ -23,4 +23,5 @@ start()
*) mount -u -o rw /;;
esac
eend $? "Root filesystem could not be mounted read/write"
+ rm -f /fastboot
}
1.1 sys-apps/openrc/files/openrc-0.2.1-no-deref-null.patch
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
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
Index: openrc-0.2.1-no-deref-null.patch
===================================================================
From: DragonK <dragonk@gmail.com>
Date: Sun, 6 Apr 2008 13:21:42 +0000 (+0100)
Subject: p could be null here.
X-Git-Url: http://git.overlays.gentoo.org/gitweb/?p=proj%2Fopenrc.git;a=commitdiff_plain;h=f183081181319271bad39cb00ff2970dc4a4ae42
p could be null here.
---
diff --git a/src/rc/rc-applets.c b/src/rc/rc-applets.c
index 70f3a04..d434be4 100644
--- a/src/rc/rc-applets.c
+++ b/src/rc/rc-applets.c
@@ -110,7 +110,7 @@ static int do_e(int argc, char **argv)
} else if (strcmp(applet, "esyslog") == 0 ||
strcmp(applet, "elog") == 0) {
p = strchr(argv[0], '.');
- if ((level = syslog_decode(p + 1, prioritynames)) == -1)
+ if (!p || (level = syslog_decode(p + 1, prioritynames)) == -1)
eerrorx("%s: invalid log level `%s'", applet, argv[0]);
if (argc < 3)
1.1 sys-apps/openrc/files/openrc-0.2.1-bad--help-output.patch
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
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
Index: openrc-0.2.1-bad--help-output.patch
===================================================================
From: Roy Marples <roy@marples.name>
Date: Mon, 7 Apr 2008 11:48:32 +0000 (+0100)
Subject: Fix rc-service --help output.
X-Git-Url: http://git.overlays.gentoo.org/gitweb/?p=proj%2Fopenrc.git;a=commitdiff_plain;h=71faee1761a57203386a7f0540cc19f5de10faa7
Fix rc-service --help output.
---
diff --git a/src/rc/rc-service.c b/src/rc/rc-service.c
index 5c6fc3d..bcbf3db 100644
--- a/src/rc/rc-service.c
+++ b/src/rc/rc-service.c
@@ -51,6 +51,7 @@ static const struct option longopts[] = {
longopts_COMMON
};
static const char * const longopts_help[] = {
+ "tests if the service exists or not",
"list all available services",
longopts_help_COMMON
};
1.1 sys-apps/openrc/files/openrc-0.2.1-openvz-support.patch
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
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
Index: openrc-0.2.1-openvz-support.patch
===================================================================
From: Roy Marples <roy@marples.name>
Date: Sun, 6 Apr 2008 20:06:07 +0000 (+0100)
Subject: Some systems are only detectable after /proc is mounted, so re-test if unknown.
X-Git-Url: http://git.overlays.gentoo.org/gitweb/?p=proj%2Fopenrc.git;a=commitdiff_plain;h=6a670fe8314be48994cbe1603312015a549f0e94
Some systems are only detectable after /proc is mounted, so re-test if unknown.
---
diff --git a/sh/init.sh.Linux.in b/sh/init.sh.Linux.in
index 25a3ecb..5aa5031 100644
--- a/sh/init.sh.Linux.in
+++ b/sh/init.sh.Linux.in
@@ -96,6 +96,9 @@ if ${mountproc}; then
fi
unset mountproc
+# Re-load RC_SYS if empty now we have /proc mounted
+[ -z "${RC_SYS}" ] && export RC_SYS="$(rc --sys)"
+
# Read off the kernel commandline to see if there's any special settings
# especially check to see if we need to set the CDBOOT environment variable
# Note: /proc MUST be mounted
diff --git a/src/rc/rc.c b/src/rc/rc.c
index b305b2d..5ae7e1f 100644
--- a/src/rc/rc.c
+++ b/src/rc/rc.c
@@ -935,11 +935,13 @@ static void handle_bad_signal(int sig)
static const struct option longopts[] = {
{ "override", 1, NULL, 'o' },
{ "service", 1, NULL, 's' },
+ { "sys", 0, NULL, 'S' },
longopts_COMMON
};
static const char * const longopts_help[] = {
"override the next runlevel to change into\nwhen leaving single user or boot runlevels",
"runs the service specified with the rest\nof the arguments",
+ "output the RC system type, if any",
longopts_help_COMMON
};
#include "_usage.c"
@@ -1028,6 +1030,12 @@ int main(int argc, char **argv)
execv(*argv, argv);
eerrorx("%s: %s", applet, strerror(errno));
/* NOTREACHED */
+ case 'S':
+ bootlevel = rc_sys();
+ if (bootlevel)
+ printf("%s\n", bootlevel);
+ exit(EXIT_SUCCESS);
+ /* NOTREACHED */
case_RC_COMMON_GETOPT
}
}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2008-04-15 5:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-15 5:59 [gentoo-commits] gentoo-x86 commit in sys-apps/openrc/files: openrc-0.2.1-respect-fastboot.patch openrc-0.2.1-no-deref-null.patch openrc-0.2.1-bad--help-output.patch openrc-0.2.1-openvz-support.patch Doug Goldstein (cardoe)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox