Date: Wed, 28 Mar 2018 17:19:04 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r331691 - stable/11/sys/tools Message-ID: <201803281719.w2SHJ4Us083707@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Wed Mar 28 17:19:04 2018 New Revision: 331691 URL: https://svnweb.freebsd.org/changeset/base/331691 Log: MFC r326992: embed_mfs: support embedding mfs into loader The script originally supported embedding an mfs into ELF files or any other type of file, because it searched for magic strings to mark the beginning and end of the embeddable section. It was later modified to read the section offset and length via readelf, which made it work for ELF only. Restore the ability to update arbitrary file types by using the readelf technique for ELF, and the magic string technique for all others (including PE/COFF files like loader.efi). Submitted by: Zakary Nafziger <worldofzak@gmail.com> MFC r327526: embed_mfs: correctly test grep return value Reported by: br MFC r327527: ath: revert accidental change committed with r327526 Sponsored by: The FreeBSD Foundation Modified: stable/11/sys/tools/embed_mfs.sh Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/tools/embed_mfs.sh ============================================================================== --- stable/11/sys/tools/embed_mfs.sh Wed Mar 28 17:16:16 2018 (r331690) +++ stable/11/sys/tools/embed_mfs.sh Wed Mar 28 17:19:04 2018 (r331691) @@ -25,10 +25,10 @@ # # $FreeBSD$ # -# Embed the MFS image into the kernel body (expects space reserved via -# MD_ROOT_SIZE) +# Embed an MFS image into the kernel body or the loader body (expects space +# reserved via MD_ROOT_SIZE (kernel) or MD_IMAGE_SIZE (loader)) # -# $1: kernel filename +# $1: kernel or loader filename # $2: MFS image filename # @@ -45,16 +45,39 @@ mfs_size=`stat -f '%z' $2 2> /dev/null` # If we can't determine MFS image size - bail. [ -z ${mfs_size} ] && echo "Can't determine MFS image size" && exit 1 -sec_info=`elfdump -c $1 2> /dev/null | grep -A 5 -E "sh_name: oldmfs$"` -# If we can't find the mfs section within the given kernel - bail. -[ -z "${sec_info}" ] && echo "Can't locate mfs section within $1" && exit 1 +err_no_mfs="Can't locate mfs section within " -sec_size=`echo "${sec_info}" | awk '/sh_size/ {print $2}' 2> /dev/null` -sec_start=`echo "${sec_info}" | awk '/sh_offset/ {print $2}' 2> /dev/null` +if file -b $1 | grep -q '^ELF ..-bit .SB executable'; then + sec_info=`elfdump -c $1 2> /dev/null | grep -A 5 -E "sh_name: oldmfs$"` + # If we can't find the mfs section within the given kernel - bail. + [ -z "${sec_info}" ] && echo "${err_no_mfs} $1" && exit 1 + + sec_size=`echo "${sec_info}" | awk '/sh_size/ {print $2}' 2>/dev/null` + sec_start=`echo "${sec_info}" | \ + awk '/sh_offset/ {print $2}' 2>/dev/null` + +else + + #try to find start byte of MFS start flag otherwise - bail. + sec_start=`strings -at d $1 | grep "MFS Filesystem goes here"` || \ + { echo "${err_no_mfs} $1"; exit 1; } + sec_start=`echo ${sec_start} | awk '{print $1}'` + + #try to find start byte of MFS end flag otherwise - bail. + sec_end=`strings -at d $1 | \ + grep "MFS Filesystem had better STOP here"` || \ + { echo "${err_no_mfs} $1"; exit 1; } + sec_end=`echo ${sec_end} | awk '{print $1}'` + + #calculate MFS section size + sec_size=`expr ${sec_end} - ${sec_start}` + +fi + # If the mfs section size is smaller than the mfs image - bail. [ ${sec_size} -lt ${mfs_size} ] && echo "MFS image too large" && exit 1 # Dump the mfs image into the mfs section dd if=$2 ibs=8192 of=$1 obs=${sec_start} oseek=1 conv=notrunc 2> /dev/null && \ - echo "MFS image embedded into kernel" && exit 0 + echo "MFS image embedded into $1" && exit 0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803281719.w2SHJ4Us083707>