Date: Wed, 28 Oct 2015 14:48:32 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290111 - in projects/release-install-debug/release: amd64 i386 pc98 powerpc sparc64 Message-ID: <201510281448.t9SEmWRD096717@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Wed Oct 28 14:48:32 2015 New Revision: 290111 URL: https://svnweb.freebsd.org/changeset/base/290111 Log: MFH r287635 for diff reduction and conflict resolution. Sponsored by: The FreeBSD Foundation Modified: projects/release-install-debug/release/amd64/mkisoimages.sh projects/release-install-debug/release/i386/mkisoimages.sh projects/release-install-debug/release/pc98/mkisoimages.sh projects/release-install-debug/release/powerpc/mkisoimages.sh projects/release-install-debug/release/sparc64/mkisoimages.sh Directory Properties: projects/release-install-debug/ (props changed) Modified: projects/release-install-debug/release/amd64/mkisoimages.sh ============================================================================== --- projects/release-install-debug/release/amd64/mkisoimages.sh Wed Oct 28 14:40:02 2015 (r290110) +++ projects/release-install-debug/release/amd64/mkisoimages.sh Wed Oct 28 14:48:32 2015 (r290111) @@ -34,7 +34,7 @@ if [ "x$1" = "x-b" ]; then mkdir efi mount -t msdosfs /dev/$device efi mkdir -p efi/efi/boot - cp ${4}/boot/loader.efi efi/efi/boot/bootx64.efi + cp "$4/boot/loader.efi" efi/efi/boot/bootx64.efi umount efi rmdir efi mdconfig -d -u $device @@ -46,15 +46,15 @@ else fi if [ $# -lt 3 ]; then - echo Usage: $0 '[-b] image-label image-name base-bits-dir [extra-bits-dir]' + echo "Usage: $0 [-b] image-label image-name base-bits-dir [extra-bits-dir]" exit 1 fi -LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift -NAME=$1; shift +LABEL=`echo "$1" | tr '[:lower:]' '[:upper:]'`; shift +NAME="$1"; shift publisher="The FreeBSD Project. http://www.FreeBSD.org/" -echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab -makefs -t cd9660 $bootable -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $* -rm -f $1/etc/fstab +echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$1/etc/fstab" +makefs -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$@" +rm -f "$1/etc/fstab" rm -f efiboot.img Modified: projects/release-install-debug/release/i386/mkisoimages.sh ============================================================================== --- projects/release-install-debug/release/i386/mkisoimages.sh Wed Oct 28 14:40:02 2015 (r290110) +++ projects/release-install-debug/release/i386/mkisoimages.sh Wed Oct 28 14:48:32 2015 (r290111) @@ -32,14 +32,14 @@ else fi if [ $# -lt 3 ]; then - echo Usage: $0 '[-b] image-label image-name base-bits-dir [extra-bits-dir]' + echo "Usage: $0 [-b] image-label image-name base-bits-dir [extra-bits-dir]" exit 1 fi -LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift -NAME=$1; shift +LABEL=`echo "$1" | tr '[:lower:]' '[:upper:]'`; shift +NAME="$1"; shift publisher="The FreeBSD Project. http://www.FreeBSD.org/" -echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab -makefs -t cd9660 $bootable -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $* -rm -f $1/etc/fstab +echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$1/etc/fstab" +makefs -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$@" +rm -f "$1/etc/fstab" Modified: projects/release-install-debug/release/pc98/mkisoimages.sh ============================================================================== --- projects/release-install-debug/release/pc98/mkisoimages.sh Wed Oct 28 14:40:02 2015 (r290110) +++ projects/release-install-debug/release/pc98/mkisoimages.sh Wed Oct 28 14:48:32 2015 (r290111) @@ -32,14 +32,14 @@ else fi if [ $# -lt 3 ]; then - echo Usage: $0 '[-b] image-label image-name base-bits-dir [extra-bits-dir]' + echo "Usage: $0 [-b] image-label image-name base-bits-dir [extra-bits-dir]" exit 1 fi -LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift -NAME=$1; shift +LABEL=`echo "$1" | tr '[:lower:]' '[:upper:]'`; shift +NAME="$1"; shift publisher="The FreeBSD Project. http://www.FreeBSD.org/" -echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab -makefs -t cd9660 $bootable -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $* -rm -f $1/etc/fstab +echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$1/etc/fstab" +makefs -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$@" +rm -f "$1/etc/fstab" Modified: projects/release-install-debug/release/powerpc/mkisoimages.sh ============================================================================== --- projects/release-install-debug/release/powerpc/mkisoimages.sh Wed Oct 28 14:40:02 2015 (r290110) +++ projects/release-install-debug/release/powerpc/mkisoimages.sh Wed Oct 28 14:48:32 2015 (r290111) @@ -25,18 +25,18 @@ if [ "x$1" = "x-b" ]; then # Apple boot code - uudecode -o /tmp/hfs-boot-block.bz2 `dirname $0`/hfs-boot.bz2.uu + uudecode -o /tmp/hfs-boot-block.bz2 "`dirname "$0"`/hfs-boot.bz2.uu" bzip2 -d /tmp/hfs-boot-block.bz2 OFFSET=$(hd /tmp/hfs-boot-block | grep 'Loader START' | cut -f 1 -d ' ') OFFSET=0x$(echo 0x$OFFSET | awk '{printf("%x\n",$1/512);}') - dd if=$4/boot/loader of=/tmp/hfs-boot-block seek=$OFFSET conv=notrunc + dd if="$4/boot/loader" of=/tmp/hfs-boot-block seek=$OFFSET conv=notrunc bootable="-o bootimage=macppc;/tmp/hfs-boot-block -o no-emul-boot" # pSeries/PAPR boot code - mkdir -p $4/ppc/chrp - cp $4/boot/loader $4/ppc/chrp - cat > $4/ppc/bootinfo.txt << EOF + mkdir -p "$4/ppc/chrp" + cp "$4/boot/loader" "$4/ppc/chrp" + cat > "$4/ppc/bootinfo.txt" << EOF <chrp-boot> <description>FreeBSD Install</description> <os-name>FreeBSD</os-name> @@ -46,7 +46,7 @@ EOF bootable="$bootable -o chrp-boot" # Playstation 3 boot code - echo "FreeBSD Install='/boot/loader.ps3'" > $4/etc/kboot.conf + echo "FreeBSD Install='/boot/loader.ps3'" > "$4/etc/kboot.conf" shift else @@ -54,16 +54,16 @@ else fi if [ $# -lt 3 ]; then - echo Usage: $0 '[-b] image-label image-name base-bits-dir [extra-bits-dir]' + echo "Usage: $0 [-b] image-label image-name base-bits-dir [extra-bits-dir]" exit 1 fi -LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift -NAME=$1; shift +LABEL=`echo "$1" | tr '[:lower:]' '[:upper:]'`; shift +NAME="$1"; shift publisher="The FreeBSD Project. http://www.FreeBSD.org/" -echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab -makefs -t cd9660 $bootable -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $* -rm -f $1/etc/fstab +echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$1/etc/fstab" +makefs -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$@" +rm -f "$1/etc/fstab" rm -f /tmp/hfs-boot-block -rm -rf $1/ppc +rm -rf "$1/ppc" Modified: projects/release-install-debug/release/sparc64/mkisoimages.sh ============================================================================== --- projects/release-install-debug/release/sparc64/mkisoimages.sh Wed Oct 28 14:40:02 2015 (r290110) +++ projects/release-install-debug/release/sparc64/mkisoimages.sh Wed Oct 28 14:48:32 2015 (r290111) @@ -23,62 +23,62 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. if [ $# -lt 3 ]; then - echo Usage: $0 '[-b] image-label image-name base-bits-dir [extra-bits-dir]' > /dev/stderr + echo "Usage: $0 [-b] image-label image-name base-bits-dir [extra-bits-dir]" > /dev/stderr exit 1 fi -case $1 in --b) BOPT=$1; shift ;; +case "$1" in +-b) BOPT="$1"; shift ;; esac -LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift -NAME=$1; shift -BASEBITSDIR=$1 +LABEL=`echo "$1" | tr '[:lower:]' '[:upper:]'`; shift +NAME="$1"; shift +BASEBITSDIR="$1" # Create an ISO image publisher="The FreeBSD Project. http://www.FreeBSD.org/" -echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "${BASEBITSDIR}/etc/fstab" -makefs -t cd9660 -o rockridge -o label="$LABEL" -o publisher="$publisher" ${NAME}.tmp $* -rm -f "${BASEBITSDIR}/etc/fstab" +echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$BASEBITSDIR/etc/fstab" +makefs -t cd9660 -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME.tmp" "$@" +rm -f "$BASEBITSDIR/etc/fstab" if [ "x$BOPT" != "x-b" ]; then - mv ${NAME}.tmp ${NAME} + mv "$NAME.tmp" "$NAME" exit 0 fi TMPIMGDIR=`mktemp -d /tmp/bootfs.XXXXXXXX` || exit 1 -BOOTFSDIR="${TMPIMGDIR}/bootfs" -BOOTFSIMG="${TMPIMGDIR}/bootfs.img" +BOOTFSDIR="$TMPIMGDIR/bootfs" +BOOTFSIMG="$TMPIMGDIR/bootfs.img" # Create a boot filesystem -mkdir -p "${BOOTFSDIR}/boot" -cp -p "${BASEBITSDIR}/boot/loader" "${BOOTFSDIR}/boot" -makefs -t ffs -B be -M 512k "${BOOTFSIMG}" "${BOOTFSDIR}" -dd if="${BASEBITSDIR}/boot/boot1" of="${BOOTFSIMG}" bs=512 conv=notrunc,sync +mkdir -p "$BOOTFSDIR/boot" +cp -p "$BASEBITSDIR/boot/loader" "$BOOTFSDIR/boot" +makefs -t ffs -B be -M 512k "$BOOTFSIMG" "$BOOTFSDIR" +dd if="$BASEBITSDIR/boot/boot1" of="$BOOTFSIMG" bs=512 conv=notrunc,sync # Create a boot ISO image : ${CYLSIZE:=640} -ISOSIZE=$(stat -f %z ${NAME}.tmp) -ISOBLKS=$(((${ISOSIZE} + 511) / 512)) -ISOCYLS=$(((${ISOBLKS} + (${CYLSIZE} - 1)) / ${CYLSIZE})) - -BOOTFSSIZE=$(stat -f %z "${BOOTFSIMG}") -BOOTFSBLKS=$(((${BOOTFSSIZE} + 511) / 512)) -BOOTFSCYLS=$(((${BOOTFSBLKS} + (${CYLSIZE} - 1)) / ${CYLSIZE})) +ISOSIZE=$(stat -f %z "$NAME.tmp") +ISOBLKS=$((($ISOSIZE + 511) / 512)) +ISOCYLS=$((($ISOBLKS + ($CYLSIZE - 1)) / $CYLSIZE)) + +BOOTFSSIZE=$(stat -f %z "$BOOTFSIMG") +BOOTFSBLKS=$((($BOOTFSSIZE + 511) / 512)) +BOOTFSCYLS=$((($BOOTFSBLKS + ($CYLSIZE - 1)) / $CYLSIZE)) -ENDCYL=$((${ISOCYLS} + ${BOOTFSCYLS})) -NSECTS=$((${ENDCYL} * 1 * ${CYLSIZE})) +ENDCYL=$(($ISOCYLS + $BOOTFSCYLS)) +NSECTS=$(($ENDCYL * 1 * $CYLSIZE)) -dd if=${NAME}.tmp of=${NAME} bs=${CYLSIZE}b conv=notrunc,sync -dd if=${BOOTFSIMG} of=${NAME} bs=${CYLSIZE}b seek=${ISOCYLS} conv=notrunc,sync +dd if="$NAME.tmp" of="$NAME" bs="${CYLSIZE}b" conv=notrunc,sync +dd if="$BOOTFSIMG" of="$NAME" bs="${CYLSIZE}b" seek=$ISOCYLS conv=notrunc,sync # The number of alternative cylinders is always 2. -dd if=/dev/zero of=${NAME} bs=${CYLSIZE}b seek=${ENDCYL} count=2 conv=notrunc,sync -rm -rf ${NAME}.tmp ${TMPIMGDIR} +dd if=/dev/zero of="$NAME" bs="${CYLSIZE}b" seek=$ENDCYL count=2 conv=notrunc,sync +rm -rf "$NAME.tmp" "$TMPIMGDIR" # Write VTOC8 label to boot ISO image -MD=`mdconfig -a -t vnode -S 512 -y 1 -x ${CYLSIZE} -f ${NAME}` -gpart create -s VTOC8 ${MD} +MD=`mdconfig -a -t vnode -S 512 -y 1 -x "$CYLSIZE" -f "$NAME"` +gpart create -s VTOC8 $MD # !4: usr, for ISO image part -gpart add -i 1 -s $((${ISOCYLS} * ${CYLSIZE} * 512))b -t \!4 ${MD} +gpart add -i 1 -s "$(($ISOCYLS * $CYLSIZE * 512))b" -t \!4 $MD # !2: root, for bootfs part. -gpart add -i 6 -s $((${BOOTFSCYLS} * ${CYLSIZE} * 512))b -t \!2 ${MD} +gpart add -i 6 -s "$(($BOOTFSCYLS * $CYLSIZE * 512))b" -t \!2 $MD mdconfig -d -u ${MD#md}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510281448.t9SEmWRD096717>