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

Diff of /trunk/src/runscript.c

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

Revision 2563 Revision 2567
232 if (ibsave) 232 if (ibsave)
233 free (ibsave); 233 free (ibsave);
234 234
235 if (in_control ()) 235 if (in_control ())
236 { 236 {
237 if (rc_service_state (applet, rc_service_starting))
238 {
239 if (rc_service_state (applet, rc_service_wasinactive))
240 rc_mark_service (applet, rc_service_inactive);
241 else
242 rc_mark_service (applet, rc_service_stopped);
243 }
244 else if (rc_service_state (applet, rc_service_stopping)) 237 if (rc_service_state (applet, rc_service_stopping))
245 { 238 {
246 /* If the we're shutting down, do it cleanly */ 239 /* If the we're shutting down, do it cleanly */
247 if ((softlevel && 240 if ((softlevel &&
248 rc_runlevel_stopping () && 241 rc_runlevel_stopping () &&
249 (strcmp (softlevel, RC_LEVEL_SHUTDOWN) == 0 || 242 (strcmp (softlevel, RC_LEVEL_SHUTDOWN) == 0 ||
251 rc_mark_service (applet, rc_service_stopped); 244 rc_mark_service (applet, rc_service_stopped);
252 else if (rc_service_state (applet, rc_service_wasinactive)) 245 else if (rc_service_state (applet, rc_service_wasinactive))
253 rc_mark_service (applet, rc_service_inactive); 246 rc_mark_service (applet, rc_service_inactive);
254 else 247 else
255 rc_mark_service (applet, rc_service_started); 248 rc_mark_service (applet, rc_service_started);
249 }
250 else if (rc_service_state (applet, rc_service_starting))
251 {
252 if (rc_service_state (applet, rc_service_wasinactive))
253 rc_mark_service (applet, rc_service_inactive);
254 else
255 rc_mark_service (applet, rc_service_stopped);
256 } 256 }
257 if (exclusive && rc_exists (exclusive)) 257 if (exclusive && rc_exists (exclusive))
258 unlink (exclusive); 258 unlink (exclusive);
259 } 259 }
260 260
776 if (! stopped) 776 if (! stopped)
777 { 777 {
778 if (rc_service_state (service, rc_service_wasinactive)) 778 if (rc_service_state (service, rc_service_wasinactive))
779 rc_mark_service (service, rc_service_inactive); 779 rc_mark_service (service, rc_service_inactive);
780 else 780 else
781 rc_mark_service (service, rc_service_stopped); 781 rc_mark_service (service, rc_service_started);
782 eerrorx ("ERROR: %s failed to stop", applet); 782 eerrorx ("ERROR: %s failed to stop", applet);
783 } 783 }
784 784
785 if (in_background) 785 if (in_background)
786 rc_mark_service (service, rc_service_inactive); 786 rc_mark_service (service, rc_service_inactive);

Legend:
Removed from v.2563  
changed lines
  Added in v.2567

  ViewVC Help
Powered by ViewVC 1.1.20