From 144d9653e11918390f2d2ae73b11e07cf312d2fa Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Tue, 28 Aug 2007 13:06:44 +0000 Subject: Undocument pause action, fix --nodeps and --ifstarted, #190045. --- src/rc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/rc.c') diff --git a/src/rc.c b/src/rc.c index 08d75262..4cb03491 100644 --- a/src/rc.c +++ b/src/rc.c @@ -977,8 +977,11 @@ int main (int argc, char **argv) strcmp (PREVLEVEL, "S") == 0 || strcmp (PREVLEVEL, "N") == 0)) { - if (get_ksoftlevel (ksoftbuffer, sizeof (ksoftbuffer))) - newlevel = ksoftbuffer; + /* Try not to join boot and ksoftlevels together */ + if (! newlevel || + strcmp (newlevel, getenv ("RC_BOOTLEVEL")) != 0) + if (get_ksoftlevel (ksoftbuffer, sizeof (ksoftbuffer))) + newlevel = ksoftbuffer; } else if (! RUNLEVEL || (strcmp (RUNLEVEL, "1") != 0 && strcmp (RUNLEVEL, "S") != 0 && -- cgit v1.2.3