librc: don't create /run/openrc itself on demand.

this is a temporary fix, in a system that boots with / as rw, /run
unmounted, and has rc_parallel on, openrc would create a dirfd to
/run/openrc before mounting /run, thus keeping an open fd to the old
/run mountpoint, and creating 'exclusive' lockfiles under it, that
subsequent services can't see nor lock on.

Fixes: #859
Fixes: 07d6f4d

Author: navi-desu

src/librc/librc-depend.c

@@ -693,6 +693,8 @@ rc_deptree_update_needed(time_t *newest, char *file)
 
 	/* Quick test to see if anything we use has changed and we have
 	 * data in our deptree. */
+	if (mkdir(rc_svcdir(), 0755) != 0 && errno != EEXIST)
+		fprintf(stderr, "mkdir '%s': %s\n", rc_svcdir(), strerror(errno));
 
 	if (fstatat(rc_dirfd(RC_DIR_SVCDIR), "deptree", &buf, 0) == 0) {
 		mtime = buf.st_mtime;

src/librc/librc.c

@@ -50,8 +50,7 @@ static int dirfds[RC_DIR_MAX];
 
 int rc_dirfd(enum rc_dir dir) {
 	int flags = O_RDONLY | O_CLOEXEC | O_DIRECTORY;
-	int dirfd = AT_FDCWD;
-	const char *dirname;
+	int dirfd;
 
 	if (dir >= RC_DIR_MAX)
 		return -1;
@@ -66,20 +65,17 @@ int rc_dirfd(enum rc_dir dir) {
 		case RC_DIR_RUNLEVEL:
 			return dirfds[dir] = open(rc_runleveldir(), flags);
 		case RC_DIR_SVCDIR:
-			dirname = rc_svcdir();
-			break;
+			return dirfds[dir] = open(rc_svcdir(), flags);
 		default:
 			assert(dirnames[dir]);
-			dirname = dirnames[dir];
 			dirfd = rc_dirfd(RC_DIR_SVCDIR);
+			if ((dirfds[dir] = openat(dirfd, dirnames[dir], flags)) == -1 && errno == ENOENT) {
+				if (mkdirat(dirfd, dirnames[dir], 0755) == -1 && errno != EEXIST)
+					return -1;
+				dirfds[dir] = openat(dirfd, dirnames[dir], flags);
+			}
 			break;
 		}
-
-		if ((dirfds[dir] = openat(dirfd, dirname, flags)) == -1 && errno == ENOENT) {
-			if (mkdirat(dirfd, dirname, 0755) == -1 && errno != EEXIST)
-				return -1;
-			dirfds[dir] = openat(dirfd, dirname, flags);
-		}
 	}
 	return dirfds[dir];
 }