Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 252134
Collapse All | Expand All

(-)./splash.c.old (-8 / +6 lines)
Lines 593-599 Link Here
593
593
594
	/* Get a list of services that we'll have to handle. */
594
	/* Get a list of services that we'll have to handle. */
595
	/* We're rebooting/shutting down. */
595
	/* We're rebooting/shutting down. */
596
	if (!strcmp(runlevel, RC_LEVEL_SHUTDOWN) || !strcmp(runlevel, RC_LEVEL_REBOOT)) {
596
	if (!strcmp(runlevel, RC_LEVEL_SHUTDOWN)) {
597
		if ((err = fbsplash_cache_prep()))
597
		if ((err = fbsplash_cache_prep()))
598
			return err;
598
			return err;
599
		splash_svcs_stop(runlevel);
599
		splash_svcs_stop(runlevel);
Lines 690-698 Link Here
690
	int retval = 0;
690
	int retval = 0;
691
691
692
	runlev = rc_runlevel_get();
692
	runlev = rc_runlevel_get();
693
	if (!strcmp(runlev, RC_LEVEL_REBOOT))
693
	if (!strcmp(runlev, RC_LEVEL_SHUTDOWN))
694
		type = fbspl_reboot;
695
	else if (!strcmp(runlev, RC_LEVEL_SHUTDOWN))
696
		type = fbspl_shutdown;
694
		type = fbspl_shutdown;
697
695
698
	/* Get boot and default levels from env variables exported by RC.
696
	/* Get boot and default levels from env variables exported by RC.
Lines 716-722 Link Here
716
			list = rc_stringlist_new();
714
			list = rc_stringlist_new();
717
			get_list_fp(list, fp);
715
			get_list_fp(list, fp);
718
			TAILQ_FOREACH(s, list, entries)
716
			TAILQ_FOREACH(s, list, entries)
719
				rc_service_mark(s->value, RC_SERVICE_COLDPLUGGED);
717
				rc_service_mark(s->value, RC_SERVICE_HOTPLUGGED);
720
			pclose(fp);
718
			pclose(fp);
721
			rc_stringlist_free(list);
719
			rc_stringlist_free(list);
722
		}
720
		}
Lines 739-745 Link Here
739
			goto exit;
737
			goto exit;
740
738
741
		if (rc_runlevel_stopping() && strcmp(runlev, bootlevel) &&
739
		if (rc_runlevel_stopping() && strcmp(runlev, bootlevel) &&
742
			strcmp(runlev, RC_LEVEL_REBOOT) && strcmp(runlev, RC_LEVEL_SHUTDOWN))
740
			strcmp(runlev, RC_LEVEL_SHUTDOWN))
743
			goto exit;
741
			goto exit;
744
	}
742
	}
745
743
Lines 763-769 Link Here
763
	case RC_HOOK_RUNLEVEL_STOP_IN:
761
	case RC_HOOK_RUNLEVEL_STOP_IN:
764
		/* Start the splash daemon on reboot. The theme hook is called
762
		/* Start the splash daemon on reboot. The theme hook is called
765
		 * from splash_start(). */
763
		 * from splash_start(). */
766
		if (strcmp(name, RC_LEVEL_REBOOT) == 0 || strcmp(name, RC_LEVEL_SHUTDOWN) == 0) {
764
		if (strcmp(name, RC_LEVEL_SHUTDOWN) == 0) {
767
			if ((i = splash_start(name))) {
765
			if ((i = splash_start(name))) {
768
				fbsplash_set_verbose(0);
766
				fbsplash_set_verbose(0);
769
				retval= i;
767
				retval= i;
Lines 788-794 Link Here
788
	case RC_HOOK_RUNLEVEL_STOP_OUT:
786
	case RC_HOOK_RUNLEVEL_STOP_OUT:
789
		/* Make sure the progress indicator reaches 100%, even if
787
		/* Make sure the progress indicator reaches 100%, even if
790
		 * something went wrong along the way. */
788
		 * something went wrong along the way. */
791
		if (strcmp(name, RC_LEVEL_REBOOT) == 0 || strcmp(name, RC_LEVEL_SHUTDOWN) == 0) {
789
		if (strcmp(name, RC_LEVEL_SHUTDOWN) == 0) {
792
			config->verbosity = FBSPL_VERB_QUIET;
790
			config->verbosity = FBSPL_VERB_QUIET;
793
			i = fbsplash_check_daemon(&pid_daemon);
791
			i = fbsplash_check_daemon(&pid_daemon);
794
			config->verbosity = FBSPL_VERB_NORMAL;
792
			config->verbosity = FBSPL_VERB_NORMAL;

Return to bug 252134