Fix dist for svn

mk/svnignore.mk

@@ -6,9 +6,7 @@ IGNOREFILES+=	${CLEANFILES}
 
 ignore:
 	@if test -n "${IGNOREFILES}"; then \
-		echo "=> Ignoring ${IGNOREFILES}"; \
-		files="$$(echo "${IGNOREFILES}" | tr ' ' '\n')"; \
-		efiles="$$(svn propget svn:ignore .)"; \
-		sfiles="$$(printf "$${files}\n$${efiles}" | sort -u)"; \
-		eval svn propset svn:ignore \'"$${sfiles}"\' .; \
+		echo "Ignoring ${IGNOREFILES}"; \
+		files="$$(echo ${IGNOREFILES} | tr ' ' '\n')"; \
+		eval svn propset svn:ignore \'"$${files}"\' .; \
 	fi

src/rc/rc.c

@@ -691,9 +691,7 @@ interactive_option:
 	}
 
 	/* Store our interactive status for boot */
-	if (interactive &&
-	    (strcmp(runlevel, RC_LEVEL_SYSINIT) == 0 ||
-	     strcmp(runlevel, getenv("RC_BOOTLEVEL")) == 0))
+	if (interactive && strcmp(runlevel, getenv("RC_BOOTLEVEL")) == 0)
 		mark_interactive();
 	else {
 		if (exists(INTERACTIVE))
@@ -893,8 +891,8 @@ main(int argc, char **argv)
 	} else {
 		/* We should not use krunevel in sysinit or the boot runlevel */
 		if (!newlevel ||
-		    (strcmp(newlevel, RC_LEVEL_SYSINIT) != 0 &&
-		     strcmp(newlevel, getenv("RC_BOOTLEVEL")) != 0))
+		    strcmp(newlevel, RC_LEVEL_SYSINIT) != 0 ||
+		    strcmp(newlevel, getenv("RC_BOOTLEVEL")) != 0)
 		{
 			if (get_krunlevel(krunlevel, sizeof(krunlevel))) {
 				newlevel = krunlevel;
@@ -902,24 +900,10 @@ main(int argc, char **argv)
 			}
 		}
 
-		if (newlevel) {
-			if (strcmp(runlevel, newlevel) != 0 &&
-			    !rc_runlevel_exists(newlevel))
-				eerrorx("%s: not a valid runlevel", newlevel);
-
-#ifdef __linux__
-			if (strcmp(newlevel, RC_LEVEL_SYSINIT) == 0) {
-				/* If we requested a runlevel, save it now */
-				p = proc_getent("rc_runlevel");
-				if (p == NULL)
-					p = proc_getent("softlevel");
-				if (p != NULL) {
-					set_krunlevel(p);
-					free(p);
-				}
-			}
-		}
-#endif
+		if (newlevel &&
+		    strcmp(runlevel, newlevel) != 0 &&
+		    !rc_runlevel_exists(newlevel))
+			eerrorx("%s: is not a valid runlevel", newlevel);
 	}
 
 	if (going_down) {
@@ -1089,7 +1073,6 @@ main(int argc, char **argv)
 			rc_service_mark(token, RC_SERVICE_STOPPED);
 		free(proc);
 	}
-
 #endif
 
 	rc_plugin_run(RC_HOOK_RUNLEVEL_START_OUT, runlevel);

src/rc/runscript.c

@@ -965,12 +965,9 @@ svc_stop(bool deps)
 	hook_out = RC_HOOK_SERVICE_STOP_OUT;
 	rc_plugin_run(RC_HOOK_SERVICE_STOP_IN, applet);
 
-	if (!rc_runlevel_stopping()) {
-		if (rc_service_in_runlevel(service, RC_LEVEL_SYSINIT))
-			ewarn ("WARNING: you are stopping a sysinit service");
-		else if (rc_service_in_runlevel(service, RC_LEVEL_BOOT))
-			ewarn ("WARNING: you are stopping a boot service");
-	}
+	if (!rc_runlevel_stopping() &&
+	    rc_service_in_runlevel(service, RC_LEVEL_BOOT))
+		ewarn ("WARNING: you are stopping a boot service");
 
 	if (deps && !(state & RC_SERVICE_WASINACTIVE)) {
 		errno = 0;