Fix v2

clexanis · Jan 18, 2023 · a642c50 · a642c50
1 parent 25c13a1
commit a642c50
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/root/defaults/chown-shim.sh b/root/defaults/chown-shim.sh
@@ -2,4 +2,4 @@
 if [[ $* = *"/data"* ]]; then
 	printf "Warning: ACL mod activated, chown of /data folders disallowed.\n"
 	exit 1; else
-	"$(which chown)-noshim $*"; fi
+	"$(which chown-noshim) $*"; fi
diff --git a/root/etc/cont-init.d/98-acl b/root/etc/cont-init.d/98-acl
@@ -10,5 +10,7 @@ fi
 chown -R root:root /root
 
 # Copy chown function into system wise shell startup folder
-cp /defaults/mods-disable-chown-data.sh /etc/profile.d/mods-disable-chown-data.sh
-chmod 644 /etc/profile.d/mods-disable-chown-data.sh
+CHOWN_PATH=$(which chown)
+mv "${CHOWN_PATH}" "${CHOWN_PATH}-noshim"
+mv "/defaults/chown-shim.sh" "${CHOWN_PATH}"
+chmod +x "${CHOWN_PATH}"
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-universal-acl-postinstall/run b/root/etc/s6-overlay/s6-rc.d/init-mods-universal-acl-postinstall/run
@@ -2,5 +2,5 @@
 # shellcheck shell=bash
 CHOWN_PATH=$(which chown)
 mv "${CHOWN_PATH}" "${CHOWN_PATH}-noshim"
-mv /defaults/chown-shim.sh "${CHOWN_PATH}"
+mv "/defaults/chown-shim.sh" "${CHOWN_PATH}"
 chmod +x "${CHOWN_PATH}"