diff options
| author | Roy Marples <roy@marples.name> | 2007-08-28 13:06:44 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2007-08-28 13:06:44 +0000 |
| commit | 144d9653e11918390f2d2ae73b11e07cf312d2fa (patch) | |
| tree | d126a4313e7b3d6a18de16ad3a5b67654fa4bb3d /src/rc.c | |
| parent | 849b983c3fb6abec364d5e9e2519ef4ba1ea5df9 (diff) | |
Undocument pause action, fix --nodeps and --ifstarted, #190045.
Diffstat (limited to 'src/rc.c')
| -rw-r--r-- | src/rc.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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 && |