From f09ca47fe5e04ca823df668c5c5c7ba69663ddf3 Mon Sep 17 00:00:00 2001
From: "Anna (navi) Figueiredo Gomes" <navi@vlhl.dev>
Date: Wed, 5 Nov 2025 00:37:34 +0100
Subject: [PATCH] init.d/*: check if RC_CACHEDIR is writtable

Bug: https://github.com/OpenRC/openrc/issues/890
Fixes: https://github.com/OpenRC/openrc/issues/936
---
 init.d/consolefont.in       | 2 +-
 init.d/save-termencoding.in | 2 +-
 init.d/savecache.in         | 2 +-
 init.d/termencoding.in      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/init.d/consolefont.in b/init.d/consolefont.in
index 48a0d2a5..6bed0a83 100644
--- a/init.d/consolefont.in
+++ b/init.d/consolefont.in
@@ -61,7 +61,7 @@ start()
 	eend $retval
 
 	# Store the font so we can use it ASAP on boot
-	if [ $retval -eq 0 ] && checkpath -m 0755 -d "$RC_CACHEDIR" 2>/dev/null; then
+	if [ $retval -eq 0 ] && checkpath -W -m 0755 -d "$RC_CACHEDIR" 2>/dev/null; then
 		mkdir -p "$RC_CACHEDIR"/console
 		setfont -O "$RC_CACHEDIR"/console/font
 	fi
diff --git a/init.d/save-termencoding.in b/init.d/save-termencoding.in
index ab1460ae..1aee2fae 100644
--- a/init.d/save-termencoding.in
+++ b/init.d/save-termencoding.in
@@ -23,7 +23,7 @@ start()
 {
 	ebegin "Saving terminal encoding"
 	# Save the encoding for use immediately at boot
-	if checkpath -m 0755 -d "$RC_CACHEDIR" 2>/dev/null; then
+	if checkpath -W -m 0755 -d "$RC_CACHEDIR" 2>/dev/null; then
 		mkdir -p "$RC_CACHEDIR"/console
 		if yesno ${unicode:-yes}; then
 			echo "" > "$RC_CACHEDIR"/console/unicode
diff --git a/init.d/savecache.in b/init.d/savecache.in
index f5912bb4..43303e95 100644
--- a/init.d/savecache.in
+++ b/init.d/savecache.in
@@ -21,7 +21,7 @@ start()
 		fi
 	fi
 
-	if ! checkpath -m 0755 -d "$RC_CACHEDIR" 2>/dev/null; then
+	if ! checkpath -W -m 0755 -d "$RC_CACHEDIR" 2>/dev/null; then
 		eerror "Unable to save dependency cache"
 		if yesno "${RC_GOINGDOWN}"; then
 			return 0
diff --git a/init.d/termencoding.in b/init.d/termencoding.in
index 466f110e..d03e5e59 100644
--- a/init.d/termencoding.in
+++ b/init.d/termencoding.in
@@ -41,7 +41,7 @@ start()
 	done
 
 	# Save the encoding for use immediately at boot
-	if checkpath -m 0755 -d "$RC_CACHEDIR"; then
+	if checkpath -W -m 0755 -d "$RC_CACHEDIR"; then
 		mkdir -p "$RC_CACHEDIR"/console
 		if yesno ${unicode:-yes}; then
 			echo "" > "$RC_CACHEDIR"/console/unicode