jail: improved environment variables control

olevole · olevole · commit f1d1360e367f · 2025-04-20T23:16:48.000+03:00
diff --git a/sudoexec/jcreate b/sudoexec/jcreate
@@ -343,6 +343,32 @@ else
 	trap "${RM_CMD} -f ${temprcconf}" HUP INT ABRT BUS TERM EXIT
 fi
 
+## environment manage
+xenvironment=
+for i in ${*}; do
+	strpos --str="${i}" --search="="
+	_pos=$?
+
+	if [ ${_pos} -ne 0 ]; then
+		_arg_len=$( strlen ${i} )
+		_pref=$(( _arg_len - _pos ))
+		ARG=$( substr --pos=0 --len=${_pos} --str="${i}" )
+
+		case "${ARG}" in
+			environment)
+				VAL=$( substr --pos=$(( _pos + 2 )) --len=${_pref} --str="${i}" | ${TR_CMD} -d '"' )
+				if [ -z "${xenvironment}" ]; then
+					xenvironment="${VAL}"
+				else
+					xenvironment="${xenvironment} ${VAL}"
+					fi
+				;;
+		esac
+		shift
+		continue
+	fi
+done
+
 # todo: when 'from' exist: use temprcconf settings to jset fromfile to re-configure default image options
 [ -n "${ofrom}" ] && from="${ofrom}"
 
@@ -449,6 +475,14 @@ if [ -n "${from}" ]; then
 		done
 	fi
 
+	echo "PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/root/bin" > ${jailsysdir}/${jname}/environment
+	if [ -n "${xenvironment}" ]; then
+		# save env
+		for i in ${xenvironment}; do
+			echo "${i}" >> ${jailsysdir}/${jname}/environment
+		done
+	fi
+
 	for i in ${MYOPTARG}; do
 		case "${i}" in
 			jname|from|removejconf)
@@ -738,32 +772,6 @@ if [ -n "${fstablocal}" ]; then
 	fi
 fi
 
-## environment manage
-xenvironment=
-for i in ${*}; do
-	strpos --str="${i}" --search="="
-	_pos=$?
-
-	if [ ${_pos} -ne 0 ]; then
-		_arg_len=$( strlen ${i} )
-		_pref=$(( _arg_len - _pos ))
-		ARG=$( substr --pos=0 --len=${_pos} --str="${i}" )
-
-		case "${ARG}" in
-			environment)
-				VAL=$( substr --pos=$(( _pos + 2 )) --len=${_pref} --str="${i}" | ${TR_CMD} -d '"' )
-				if [ -z "${xenvironment}" ]; then
-					xenvironment="${VAL}"
-				else
-					xenvironment="${xenvironment} ${VAL}"
-					fi
-				;;
-		esac
-		shift
-		continue
-	fi
-done
-
 echo "PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/root/bin" > ${jailsysdir}/${jname}/environment
 if [ -n "${xenvironment}" ]; then
 	# save env
