manjaro: ensure that /etc/environment always read

Adjust PAM configuration.
termux · Oct 25, 2023 · 373f982 · 373f982
1 parent fded010
commit 373f982
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/distro-build/manjaro.sh b/distro-build/manjaro.sh
@@ -44,4 +44,13 @@ write_plugin() {
 	TARBALL_URL['aarch64']="${GIT_RELEASE_URL}/manjaro-aarch64-pd-${CURRENT_VERSION}.tar.xz"
 	TARBALL_SHA256['aarch64']="$(sha256sum "${ROOTFS_DIR}/manjaro-aarch64-pd-${CURRENT_VERSION}.tar.xz" | awk '{ print $1}')"
 	EOF
+
+	distro_setup() {
+	${TAB}# Fix environment variables on login or su.
+	${TAB}local f
+	${TAB}for f in su su-l system-local-login system-remote-login; do
+	${TAB}${TAB}echo "session  required  pam_env.so readenv=1" >> ./etc/pam.d/"${f}"
+	${TAB}done
+	}
+	EOF
 }
diff --git a/distro-plugins/manjaro.sh b/distro-plugins/manjaro.sh
@@ -6,3 +6,11 @@ DISTRO_COMMENT="Currently available only for AArch64."
 
 TARBALL_URL['aarch64']="https://github.com/termux/proot-distro/releases/download/v3.18.1/manjaro-aarch64-pd-v3.18.1.tar.xz"
 TARBALL_SHA256['aarch64']="6d6595ab9650a1836efe9dd23e0b7b321cdaf01b15ed95413036f53f6a25f495"
+
+distro_setup() {
+	# Fix environment variables on login or su.
+	local f
+	for f in su su-l system-local-login system-remote-login; do
+		echo "session  required  pam_env.so readenv=1" >> ./etc/pam.d/"${f}"
+	done
+}