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

Diff of /trunk/src/runscript.c

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

Revision 2976 Revision 2977
235 STRLIST_FOREACH (list, svc, i) { 235 STRLIST_FOREACH (list, svc, i) {
236 if (rc_service_state (svc) & RC_SERVICE_STOPPED) { 236 if (rc_service_state (svc) & RC_SERVICE_STOPPED) {
237 if (state & RC_SERVICE_INACTIVE || 237 if (state & RC_SERVICE_INACTIVE ||
238 state & RC_SERVICE_WASINACTIVE) 238 state & RC_SERVICE_WASINACTIVE)
239 { 239 {
240 rc_schedule_start_service (service, svc); 240 rc_service_schedule_start (service, svc);
241 ewarn ("WARNING: %s is scheduled to started when %s has started", 241 ewarn ("WARNING: %s is scheduled to started when %s has started",
242 svc, applet); 242 svc, applet);
243 } else 243 } else
244 rc_service_start (svc); 244 rc_service_start (svc);
245 } 245 }
678 678
679 rc_strlist_free (types); 679 rc_strlist_free (types);
680 types = NULL; 680 types = NULL;
681 rc_strlist_add (&types, "iprovide"); 681 rc_strlist_add (&types, "iprovide");
682 STRLIST_FOREACH (tmplist, svc, i) { 682 STRLIST_FOREACH (tmplist, svc, i) {
683 rc_schedule_start_service (svc, service); 683 rc_service_schedule_start (svc, service);
684 684
685 rc_strlist_free (svclist); 685 rc_strlist_free (svclist);
686 svclist = NULL; 686 svclist = NULL;
687 rc_strlist_add (&svclist, svc); 687 rc_strlist_add (&svclist, svc);
688 rc_strlist_free (providelist); 688 rc_strlist_free (providelist);
689 providelist = rc_deptree_depends (deptree, types, svclist, 689 providelist = rc_deptree_depends (deptree, types, svclist,
690 softlevel, depoptions); 690 softlevel, depoptions);
691 STRLIST_FOREACH (providelist, svc2, j) 691 STRLIST_FOREACH (providelist, svc2, j)
692 rc_schedule_start_service (svc2, service); 692 rc_service_schedule_start (svc2, service);
693 693
694 len += strlen (svc) + 2; 694 len += strlen (svc) + 2;
695 n++; 695 n++;
696 } 696 }
697 697
1242 rc_service_state (service) & RC_SERVICE_INACTIVE) 1242 rc_service_state (service) & RC_SERVICE_INACTIVE)
1243 { 1243 {
1244 int j; 1244 int j;
1245 STRLIST_FOREACH (restart_services, svc, j) 1245 STRLIST_FOREACH (restart_services, svc, j)
1246 if (rc_service_state (svc) & RC_SERVICE_STOPPED) 1246 if (rc_service_state (svc) & RC_SERVICE_STOPPED)
1247 rc_schedule_start_service (service, svc); 1247 rc_service_schedule_start (service, svc);
1248 } 1248 }
1249 } 1249 }
1250 } else if (strcmp (optarg, "zap") == 0) { 1250 } else if (strcmp (optarg, "zap") == 0) {
1251 einfo ("Manually resetting %s to stopped state", applet); 1251 einfo ("Manually resetting %s to stopped state", applet);
1252 rc_service_mark (applet, RC_SERVICE_STOPPED); 1252 rc_service_mark (applet, RC_SERVICE_STOPPED);

Legend:
Removed from v.2976  
changed lines
  Added in v.2977

  ViewVC Help
Powered by ViewVC 1.1.20