openrc: Don't use libexec for data cache.

init.d/consolefont.in

@@ -61,9 +61,9 @@ start()
 	eend $retval
 
 	# Store the font so we can use it ASAP on boot
-	if [ $retval -eq 0 ] && checkpath -W "$RC_LIBEXECDIR"; then
-		mkdir -p "$RC_LIBEXECDIR"/console
-		setfont -O "$RC_LIBEXECDIR"/console/font
+	if [ $retval -eq 0 ] && checkpath -m 0755 -d "$RC_CACHEDIR"; then
+		mkdir -p "$RC_CACHEDIR"/console
+		setfont -O "$RC_CACHEDIR"/console/font
 	fi
 
 	return $retval

init.d/save-termencoding.in

@@ -23,12 +23,12 @@ start()
 {
 	ebegin "Saving terminal encoding"
 	# Save the encoding for use immediately at boot
-	if checkpath -W "$RC_LIBEXECDIR"; then
-		mkdir -p "$RC_LIBEXECDIR"/console
+	if checkpath -m 0755 -d "$RC_CACHEDIR"; then
+		mkdir -p "$RC_CACHEDIR"/console
 		if yesno ${unicode:-yes}; then
-			echo "" > "$RC_LIBEXECDIR"/console/unicode
+			echo "" > "$RC_CACHEDIR"/console/unicode
 		else
-			rm -f "$RC_LIBEXECDIR"/console/unicode
+			rm -f "$RC_CACHEDIR"/console/unicode
 		fi
 	fi
 	eend 0

init.d/savecache.in

@@ -20,47 +20,27 @@ start()
 			return 1
 		fi
 	fi
-	if [ ! -d "$RC_LIBEXECDIR"/cache ]; then
-		if ! checkpath -W "$RC_LIBEXECDIR"; then
-			eerror "${RC_LIBEXECDIR} is not writable!"
-			eerror "Unable to save dependency cache"
-			if yesno "${RC_GOINGDOWN}"; then
-				return 0
-			fi
-			return 1
-		fi
-		rm -rf "$RC_LIBEXECDIR"/cache
-		if ! mkdir -p "$RC_LIBEXECDIR"/cache; then
-			eerror "Unable to create $RC_LIBEXECDIR/cache"
-			eerror "Unable to save dependency cache"
-			if yesno "${RC_GOINGDOWN}"; then
-				return 0
-			fi
-			return 1
-		fi
-	fi
-	if ! checkpath -W "$RC_LIBEXECDIR"/cache; then
-		eerror "${RC_LIBEXECDIR}/cache is not writable!"
+
+	if ! checkpath -m 0755 -d "$RC_CACHEDIR"; then
 		eerror "Unable to save dependency cache"
 		if yesno "${RC_GOINGDOWN}"; then
 			return 0
 		fi
 		return 1
 	fi
+
 	ebegin "Saving dependency cache"
 	local rc=0 save=
-	for x in depconfig deptree rc.log shutdowntime softlevel; do
+	for x in depconfig deptree rc.log shutdowntime; do
 		[ -e "$RC_SVCDIR/$x" ] && save="$save $RC_SVCDIR/$x"
 	done
 	if [ -n "$save" ]; then
-		cp -p $save "$RC_LIBEXECDIR"/cache
+		cp -p $save "$RC_CACHEDIR"
 		rc=$?
 	fi
+	eend $rc "Unable to save dependency cache"
+
 	if yesno "${RC_GOINGDOWN}"; then
-		if [ $rc -ne 0 ]; then
-			eerror "Unable to save dependency cache"
-		fi
-		eend 0
+		return 0
 	fi
-	eend $rc "Unable to save dependency cache"
 }

init.d/termencoding.in

@@ -41,12 +41,12 @@ start()
 	done
 
 	# Save the encoding for use immediately at boot
-	if checkpath -W "$RC_LIBEXECDIR"; then
-		mkdir -p "$RC_LIBEXECDIR"/console
+	if checkpath -m 0755 -d "$RC_CACHEDIR"; then
+		mkdir -p "$RC_CACHEDIR"/console
 		if yesno ${unicode:-yes}; then
-			echo "" > "$RC_LIBEXECDIR"/console/unicode
+			echo "" > "$RC_CACHEDIR"/console/unicode
 		else
-			rm -f "$RC_LIBEXECDIR"/console/unicode
+			rm -f "$RC_CACHEDIR"/console/unicode
 		fi
 	fi
 

sh/init-early.sh.Linux.in

@@ -11,6 +11,7 @@
 
 : ${CONSOLE:=/dev/console}
 : ${RC_LIBEXECDIR:=@LIBEXECDIR@}
+: ${RC_CACHEDIR:=/var/cache/openrc}
 
 service_present()
 {
@@ -25,7 +26,7 @@ service_present()
 	return 0
 }
 
-if [ -e "$RC_LIBEXECDIR"/console/unicode ]; then
+if [ -e "$RC_CACHEDIR"/console/unicode ]; then
 	termencoding="%G"
 	kmode="-u"
 else
@@ -40,19 +41,19 @@ fi
 if service_present "$RC_DEFAULTLEVEL" consolefont ||
    service_present "$RC_BOOTLEVEL" consolefont; then
 	printf "\033%s" "$termencoding" >"$CONSOLE" 2>/dev/null
-	if [ -r "$RC_LIBEXECDIR"/console/font ] && \
+	if [ -r "$RC_CACHEDIR"/console/font ] && \
 		command -v setfont > /dev/null 2>&1; then
 		[ -c "$CONSOLE" ] && cons="-C $CONSOLE"
-		setfont $cons "$RC_LIBEXECDIR"/console/font 2>/dev/null
+		setfont $cons "$RC_CACHEDIR"/console/font 2>/dev/null
 	fi
 fi
 
 # Try and set a keyboard map as early as possible
 if service_present "$RC_DEFAULTLEVEL" keymaps ||
    service_present "$RC_BOOTLEVEL" keymaps; then
 	kbd_mode $kmode -C "$CONSOLE" 2>/dev/null
-	if [ -r "$RC_LIBEXECDIR"/console/keymap ]; then
-		loadkeys -q "$RC_LIBEXECDIR"/console/keymap 2>/dev/null
+	if [ -r "$RC_CACHEDIR"/console/keymap ]; then
+		loadkeys -q "$RC_CACHEDIR"/console/keymap 2>/dev/null
 	fi
 fi
 

sh/init.sh.Linux.in

@@ -95,8 +95,8 @@ if grep -Eq "[[:space:]]+xenfs$" /proc/filesystems; then
 	eend $?
 fi
 
-if [ -e "$RC_LIBEXECDIR"/cache/softlevel ]; then
-	cp -p "$RC_LIBEXECDIR"/cache/* "$RC_SVCDIR" 2>/dev/null
+if [ -d "$RC_CACHEDIR" ]; then
+	cp -p "$RC_CACHEDIR"/* "$RC_SVCDIR" 2>/dev/null
 fi
 
 echo sysinit >"$RC_SVCDIR"/softlevel

src/openrc/rc.c

@@ -515,8 +515,7 @@ do_sysinit(void)
 	 * sys */
 	if ((sys = rc_sys()))
 		setenv("RC_SYS", sys, 1);
-	/* force an update of the dependency tree */
-	if ((main_deptree = _rc_deptree_load(1, NULL)) == NULL)
+	if ((main_deptree = _rc_deptree_load(false, NULL)) == NULL)
 		eerrorx("failed to load deptree");
 }
 

src/shared/misc.c

@@ -177,6 +177,7 @@ env_config(void)
 	setenv("RC_LIBEXECDIR", RC_LIBEXECDIR, 1);
 	setenv("RC_SVCDIR", RC_SVCDIR, 1);
 	setenv("RC_TMPDIR", RC_SVCDIR "/tmp", 1);
+	setenv("RC_CACHEDIR", "/var/cache/openrc", 1);
 	setenv("RC_BOOTLEVEL", RC_LEVEL_BOOT, 1);
 	e = rc_runlevel_get();
 	setenv("RC_RUNLEVEL", e, 1);