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

Diff of /trunk/src/runscript.c

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

Revision 2659 Revision 2666
555 ! rc_service_state (service, rc_service_stopped)) 555 ! rc_service_state (service, rc_service_stopped))
556 exit (EXIT_FAILURE); 556 exit (EXIT_FAILURE);
557 background = true; 557 background = true;
558 } 558 }
559 559
560 if (rc_service_state (service, rc_service_started)) 560 if (rc_service_state (service, rc_service_started)) {
561 ewarnx ("WARNING: %s has already been started", applet); 561 ewarn ("WARNING: %s has already been started", applet);
562 return;
562 else if (rc_service_state (service, rc_service_starting)) 563 } else if (rc_service_state (service, rc_service_starting))
563 ewarnx ("WARNING: %s is already starting", applet); 564 ewarnx ("WARNING: %s is already starting", applet);
564 else if (rc_service_state (service, rc_service_stopping)) 565 else if (rc_service_state (service, rc_service_stopping))
565 ewarnx ("WARNING: %s is stopping", applet); 566 ewarnx ("WARNING: %s is stopping", applet);
566 else if (rc_service_state (service, rc_service_inactive) && ! background) 567 else if (rc_service_state (service, rc_service_inactive) && ! background)
567 ewarnx ("WARNING: %s has already started, but is inactive", applet); 568 ewarnx ("WARNING: %s has already started, but is inactive", applet);
763 if (rc_is_env ("IN_HOTPLUG", "1") || in_background) 764 if (rc_is_env ("IN_HOTPLUG", "1") || in_background)
764 if (! rc_service_state (service, rc_service_started) && 765 if (! rc_service_state (service, rc_service_started) &&
765 ! rc_service_state (service, rc_service_inactive)) 766 ! rc_service_state (service, rc_service_inactive))
766 exit (EXIT_FAILURE); 767 exit (EXIT_FAILURE);
767 768
768 if (rc_service_state (service, rc_service_stopped)) 769 if (rc_service_state (service, rc_service_stopped)) {
769 ewarnx ("WARNING: %s is already stopped", applet); 770 ewarn ("WARNING: %s is already stopped", applet);
771 return;
770 else if (rc_service_state (service, rc_service_stopping)) 772 } else if (rc_service_state (service, rc_service_stopping))
771 ewarnx ("WARNING: %s is already stopping", applet); 773 ewarnx ("WARNING: %s is already stopping", applet);
772 774
773 if (! rc_mark_service (service, rc_service_stopping)) 775 if (! rc_mark_service (service, rc_service_stopping))
774 eerrorx ("ERROR: %s has been stopped by something else", applet); 776 eerrorx ("ERROR: %s has been stopped by something else", applet);
775 777

Legend:
Removed from v.2659  
changed lines
  Added in v.2666

  ViewVC Help
Powered by ViewVC 1.1.20