Attachment #400300 for bug #545162




			mount -t binfmt_misc -o nodev,noexec,nosuid \
				binfmt_misc /proc/sys/fs/binfmt_misc
			if eend $? ; then
				local fmts
				ebegin "Loading custom binary format handlers"
				"$RC_LIBEXECDIR"/sh/binfmt.sh
					/run/binfmt.d/*.conf \
					/etc/binfmt.d/*.conf \
					""/usr/lib/binfmt.d/*.conf)
				if [ -n "${fmts}" ]; then
					echo "${fmts}" > /proc/sys/fs/binfmt_misc/register
				fi
				eend $?
			fi
		fi

Lines 12-20 include ${MK}/os.mk Link Here

(-)a/sh/Makefile (-3 / +3 lines)
12	SRCS-FreeBSD=	12	SRCS-FreeBSD=
13	BIN-FreeBSD=	13	BIN-FreeBSD=
14		14
15	SRCS-Linux= cgroup-release-agent.sh.in init-early.sh.in migrate-to-run.sh.in \	15	SRCS-Linux= binfmt.sh.in cgroup-release-agent.sh.in init-early.sh.in \
16	rc-cgroup.sh.in	16	migrate-to-run.sh.in rc-cgroup.sh.in
17	BIN-Linux= cgroup-release-agent.sh init-early.sh migrate-to-run.sh \	17	BIN-Linux= binfmt.sh cgroup-release-agent.sh init-early.sh migrate-to-run.sh \
18	rc-cgroup.sh	18	rc-cgroup.sh
19		19
20	SRCS-NetBSD=	20	SRCS-NetBSD=




#!/bin/sh
# This is a reimplementation of the systemd binfmt.d code to register
# misc binary formats with the kernel.
#
# Copyright (c) 2015 William Hubbs
# Released under the 2-clause BSD license.
#
# See the binfmt.d manpage as well:
# http://0pointer.de/public/systemd-man/binfmt.d.html
# This script should match the manpage as of 2015/03/31
#

warninvalid() {
	printf "binfmt: invalid entry on line %d of \`%s'\n" "$LINENUM" "$FILE"
	error=$(( error+1 ))
} >&2

dryrun_or_real() {
	local dry=
	[ -n "$DRYRUN" ] && dry=echo
	$dry "$@"
}

# parse the command line
while [ $# -gt 0 ]; do
	case $1 in
		--verbose) VERBOSE=1 ;;
		--dryrun|--dry-run) DRYRUN=1 ;;
	esac
	shift
done

error=0 LINENUM=0

# The hardcoding of these paths is intentional; we are following the
# systemd spec.
binfmt_dirs='/usr/lib/binfmt.d/ /run/binfmt.d/ /etc/binfmt.d/'
binfmt_basenames=''
binfmt_d=''
# Build a list of sorted unique basenames
# directories declared later in the binfmt_d list will override earlier
# directories, on a per file basename basis.
# `/run/binfmt.d/foo.conf' supersedes `/usr/lib/binfmt.d/foo.conf'.
# `/run/binfmt.d/foo.conf' will always be read after `/etc/binfmt.d/bar.conf'
for d in ${binfmt_dirs} ; do
	[ -d $d ] && for f in ${d}/*.conf ; do
		case "${f##*/}" in
			systemd.conf|systemd-*.conf) continue;;
		esac
		[ -f $f ] && binfmt_basenames="${binfmt_basenames}\n${f##*/}"
	done # for f in ${d}
done # for d in ${binfmt_dirs}
binfmt_basenames="$(printf "${binfmt_basenames}\n" | sort -u )"

for b in $binfmt_basenames ; do
	real_f=''
	for d in $binfmt_dirs ; do
		f=${d}/${b}
		[ -f "${f}" ] && real_f=$f
	done
	[ -f "${real_f}" ] && binfmt_d="${binfmt_d} ${real_f}"
done

# loop through the gathered fragments, sorted globally by filename.
# `/run/binfmt.d/foo.conf' will always be read after `/etc/binfmt.d/bar.conf'
for FILE in $binfmt_d ; do
	LINENUM=0

	### FILE FORMAT ###
	# See https://www.kernel.org/doc/Documentation/binfmt_misc.txt

	while read line; do
		LINENUM=$(( LINENUM+1 ))

		case $line in
			\#*) continue ;;
			\;*) continue ;;
		esac

		[ -n "$VERBOSE" ] && echo $line
		dryrun_or_real echo "${line}" > /proc/sys/fs/binfmt_misc/register
		rc=$?
		if [ -z "${DRYRUN}" ]; then
			if [ $rc -ne 0 ]; then
				error=$((error + 1))
				warninvalid
			fi
		fi
	done <$FILE
done

exit $error

# vim: set ts=2 sw=2 sts=2 noet ft=sh:

Return to bug 545162

Lines 27-41 start() Link Here

(-)a/init.d/procfs.in (-8 / +1 lines)
27	mount -t binfmt_misc -o nodev,noexec,nosuid \	27	mount -t binfmt_misc -o nodev,noexec,nosuid \
28	binfmt_misc /proc/sys/fs/binfmt_misc	28	binfmt_misc /proc/sys/fs/binfmt_misc
29	if eend $? ; then	29	if eend $? ; then
30	local fmts
31	ebegin "Loading custom binary format handlers"	30	ebegin "Loading custom binary format handlers"
32	fmts=$(grep -hsv -e '^[#;]' -e '^[[:space:]]*$' \	31	"$RC_LIBEXECDIR"/sh/binfmt.sh
33	/run/binfmt.d/*.conf \
34	/etc/binfmt.d/*.conf \
35	""/usr/lib/binfmt.d/*.conf)
36	if [ -n "${fmts}" ]; then
37	echo "${fmts}" > /proc/sys/fs/binfmt_misc/register
38	fi
39	eend $?	32	eend $?
40	fi	33	fi
41	fi	34	fi

Line 0 Link Here

(-)a/sh/binfmt.sh.in (-1 / +94 lines)
0	-	1	#!/bin/sh
		2	# This is a reimplementation of the systemd binfmt.d code to register
		3	# misc binary formats with the kernel.
		4	#
		5	# Copyright (c) 2015 William Hubbs
		6	# Released under the 2-clause BSD license.
		7	#
		8	# See the binfmt.d manpage as well:
		9	# http://0pointer.de/public/systemd-man/binfmt.d.html
		10	# This script should match the manpage as of 2015/03/31
		11	#
		12
		13	warninvalid() {
		14	printf "binfmt: invalid entry on line %d of \`%s'\n" "$LINENUM" "$FILE"
		15	error=$(( error+1 ))
		16	} >&2
		17
		18	dryrun_or_real() {
		19	local dry=
		20	[ -n "$DRYRUN" ] && dry=echo
		21	$dry "$@"
		22	}
		23
		24	# parse the command line
		25	while [ $# -gt 0 ]; do
		26	case $1 in
		27	--verbose) VERBOSE=1 ;;
		28	--dryrun\|--dry-run) DRYRUN=1 ;;
		29	esac
		30	shift
		31	done
		32
		33	error=0 LINENUM=0
		34
		35	# The hardcoding of these paths is intentional; we are following the
		36	# systemd spec.
		37	binfmt_dirs='/usr/lib/binfmt.d/ /run/binfmt.d/ /etc/binfmt.d/'
		38	binfmt_basenames=''
		39	binfmt_d=''
		40	# Build a list of sorted unique basenames
		41	# directories declared later in the binfmt_d list will override earlier
		42	# directories, on a per file basename basis.
		43	# `/run/binfmt.d/foo.conf' supersedes `/usr/lib/binfmt.d/foo.conf'.
		44	# `/run/binfmt.d/foo.conf' will always be read after `/etc/binfmt.d/bar.conf'
		45	for d in ${binfmt_dirs} ; do
		46	[ -d $d ] && for f in ${d}/*.conf ; do
		47	case "${f##*/}" in
		48	systemd.conf\|systemd-*.conf) continue;;
		49	esac
		50	[ -f $f ] && binfmt_basenames="${binfmt_basenames}\n${f##*/}"
		51	done # for f in ${d}
		52	done # for d in ${binfmt_dirs}
		53	binfmt_basenames="$(printf "${binfmt_basenames}\n" \| sort -u )"
		54
		55	for b in $binfmt_basenames ; do
		56	real_f=''
		57	for d in $binfmt_dirs ; do
		58	f=${d}/${b}
		59	[ -f "${f}" ] && real_f=$f
		60	done
		61	[ -f "${real_f}" ] && binfmt_d="${binfmt_d} ${real_f}"
		62	done
		63
		64	# loop through the gathered fragments, sorted globally by filename.
		65	# `/run/binfmt.d/foo.conf' will always be read after `/etc/binfmt.d/bar.conf'
66	for FILE in $binfmt_d ; do
67	LINENUM=0
68
69	### FILE FORMAT ###
70	# See https://www.kernel.org/doc/Documentation/binfmt_misc.txt
71
72	while read line; do
73	LINENUM=$(( LINENUM+1 ))
74
75	case $line in
76	\#*) continue ;;
77	\;*) continue ;;
78	esac
79
80	[ -n "$VERBOSE" ] && echo $line
81	dryrun_or_real echo "${line}" > /proc/sys/fs/binfmt_misc/register
82	rc=$?
83	if [ -z "${DRYRUN}" ]; then
84	if [ $rc -ne 0 ]; then
85	error=$((error + 1))
86	warninvalid
87	fi
88	fi
89	done <$FILE
90	done
91
92	exit $error
93
94	# vim: set ts=2 sw=2 sts=2 noet ft=sh: