/[baselayout]/trunk/src/rc.c
Gentoo

Diff of /trunk/src/rc.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 2854 Revision 2855
975 if (PREVLEVEL && 975 if (PREVLEVEL &&
976 (strcmp (PREVLEVEL, "1") == 0 || 976 (strcmp (PREVLEVEL, "1") == 0 ||
977 strcmp (PREVLEVEL, "S") == 0 || 977 strcmp (PREVLEVEL, "S") == 0 ||
978 strcmp (PREVLEVEL, "N") == 0)) 978 strcmp (PREVLEVEL, "N") == 0))
979 { 979 {
980 /* Try not to join boot and ksoftlevels together */
981 if (! newlevel ||
982 strcmp (newlevel, getenv ("RC_BOOTLEVEL")) != 0)
980 if (get_ksoftlevel (ksoftbuffer, sizeof (ksoftbuffer))) 983 if (get_ksoftlevel (ksoftbuffer, sizeof (ksoftbuffer)))
981 newlevel = ksoftbuffer; 984 newlevel = ksoftbuffer;
982 } else if (! RUNLEVEL || 985 } else if (! RUNLEVEL ||
983 (strcmp (RUNLEVEL, "1") != 0 && 986 (strcmp (RUNLEVEL, "1") != 0 &&
984 strcmp (RUNLEVEL, "S") != 0 && 987 strcmp (RUNLEVEL, "S") != 0 &&
985 strcmp (RUNLEVEL, "N") != 0)) 988 strcmp (RUNLEVEL, "N") != 0))
986 { 989 {

Legend:
Removed from v.2854  
changed lines
  Added in v.2855

  ViewVC Help
Powered by ViewVC 1.1.20