svn commit: r221494 - in head/release: amd64 i386 pc98 powerpc

[Nathan Whitehorn]

Author: nwhitehorn
Date: Thu May  5 13:55:43 2011
New Revision: 221494
URL: http://svn.freebsd.org/changeset/base/221494

Log:
  Garbage collect some unused variables and stray debug code.
  
  Submitted by:	marius

Modified:
  head/release/amd64/mkisoimages.sh
  head/release/i386/mkisoimages.sh
  head/release/pc98/mkisoimages.sh
  head/release/powerpc/mkisoimages.sh

Modified: head/release/amd64/mkisoimages.sh
==============================================================================
--- head/release/amd64/mkisoimages.sh	Thu May  5 12:52:05 2011	(r221493)
+++ head/release/amd64/mkisoimages.sh	Thu May  5 13:55:43 2011	(r221494)
@@ -23,7 +23,6 @@
 # extra-bits-dir, if provided, contains additional files to be merged
 # into base-bits-dir as part of making the image.
 
-publisher="The FreeBSD Project.  http://www.freebsd.org/"
 if [ "x$1" = "x-b" ]; then
 	# This is highly x86-centric and will be used directly below.
 	bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"

Modified: head/release/i386/mkisoimages.sh
==============================================================================
--- head/release/i386/mkisoimages.sh	Thu May  5 12:52:05 2011	(r221493)
+++ head/release/i386/mkisoimages.sh	Thu May  5 13:55:43 2011	(r221494)
@@ -23,7 +23,6 @@
 # extra-bits-dir, if provided, contains additional files to be merged
 # into base-bits-dir as part of making the image.
 
-publisher="The FreeBSD Project.  http://www.freebsd.org/"
 if [ "x$1" = "x-b" ]; then
 	# This is highly x86-centric and will be used directly below.
 	bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"

Modified: head/release/pc98/mkisoimages.sh
==============================================================================
--- head/release/pc98/mkisoimages.sh	Thu May  5 12:52:05 2011	(r221493)
+++ head/release/pc98/mkisoimages.sh	Thu May  5 13:55:43 2011	(r221494)
@@ -23,7 +23,6 @@
 # extra-bits-dir, if provided, contains additional files to be merged
 # into base-bits-dir as part of making the image.
 
-publisher="The FreeBSD Project.  http://www.freebsd.org/"
 if [ "x$1" = "x-b" ]; then
 	# This is highly x86-centric and will be used directly below.
 	bootable="-o generic-bootimage=$4/boot/cdboot"

Modified: head/release/powerpc/mkisoimages.sh
==============================================================================
--- head/release/powerpc/mkisoimages.sh	Thu May  5 12:52:05 2011	(r221493)
+++ head/release/powerpc/mkisoimages.sh	Thu May  5 13:55:43 2011	(r221494)
@@ -23,13 +23,11 @@
 # extra-bits-dir, if provided, contains additional files to be merged
 # into base-bits-dir as part of making the image.
 
-publisher="The FreeBSD Project.  http://www.freebsd.org/"
 if [ "x$1" = "x-b" ]; then
 	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);}')
-	echo 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"