Attachment #150407 for bug #195831

View | Details | Raw Unified | Return to bug 195831
Collapse All | Expand All




# into base-bits-dir as part of making the image.

if [ "x$1" = "x-b" ]; then
	bootable=true
	# This is highly x86-centric and will be used directly below.
	bootopts="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"

	# Make EFI system partition (should be done with makefs in the future)
	dd if=/dev/zero of=efiboot.img bs=4k count=100

	umount efi
	rmdir efi
	mdconfig -d -u $device
	bootopts="-o bootimage=i386;efiboot.img -o no-emul-boot $bootopts"
	
	shift
else
	bootable=false
	bootopts=""
fi

if [ $# -lt 3 ]; then

NAME=$1; shift

publisher="The FreeBSD Project.  http://www.FreeBSD.org/"
$bootable && echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
makefs -t cd9660 $bootopts -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*
$bootable && rm $1/etc/fstab
rm -f efiboot.img




# into base-bits-dir as part of making the image.

if [ "x$1" = "x-b" ]; then
	bootable=true
	# This is highly x86-centric and will be used directly below.
	bootopts="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"
	shift
else
	bootable=false
	bootopts=""
fi

if [ $# -lt 3 ]; then

NAME=$1; shift

publisher="The FreeBSD Project.  http://www.FreeBSD.org/"
$bootable && echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
makefs -t cd9660 $bootopts -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*
$bootable && rm $1/etc/fstab




# into base-bits-dir as part of making the image.

if [ "x$1" = "x-b" ]; then
	bootable=true
	# This is highly x86-centric and will be used directly below.
	bootopts="-o generic-bootimage=$4/boot/cdboot"
	shift
else
	bootable=false
	bootopts=""
fi

if [ $# -lt 3 ]; then

NAME=$1; shift

publisher="The FreeBSD Project.  http://www.FreeBSD.org/"
$bootable && echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
makefs -t cd9660 $bootopts -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*
$bootable && rm $1/etc/fstab




# into base-bits-dir as part of making the image.

if [ "x$1" = "x-b" ]; then
	bootable=true
	# Apple boot code
	uudecode -o /tmp/hfs-boot-block.bz2 `dirname $0`/hfs-boot.bz2.uu
	bzip2 -d /tmp/hfs-boot-block.bz2

	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

	bootopts="-o bootimage=macppc;/tmp/hfs-boot-block -o no-emul-boot"

	# pSeries/PAPR boot code
	mkdir -p $4/ppc/chrp

<boot-script>boot &device;:,\ppc\chrp\loader</boot-script>
</chrp-boot>
EOF
	bootopts="$bootopts -o chrp-boot"

	# Playstation 3 boot code
	echo "FreeBSD Install='/boot/loader.ps3'" > $4/etc/kboot.conf

	shift
else
	bootable=false
	bootopts=""
fi

if [ $# -lt 3 ]; then

NAME=$1; shift

publisher="The FreeBSD Project.  http://www.FreeBSD.org/"
$bootable && echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
makefs -t cd9660 $bootopts -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*
$bootable && rm $1/etc/fstab
rm /tmp/hfs-boot-block
rm -rf $1/ppc




fi

case $1 in
-b)	BOPT=$1; bootable=true; shift ;;
esac
LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
NAME=$1; shift


# Create an ISO image
publisher="The FreeBSD Project.  http://www.FreeBSD.org/"
$bootable && echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "${BASEBITSDIR}/etc/fstab"
makefs -t cd9660 -o rockridge -o label="$LABEL" -o publisher="$publisher" ${NAME}.tmp $*
$bootable && rm "${BASEBITSDIR}/etc/fstab"

if [ "x$BOPT" != "x-b" ]; then
	mv ${NAME}.tmp ${NAME}

Return to bug 195831

Lines 24-31 Link Here

(-)b/release/amd64/mkisoimages.sh (-6 / +8 lines)
24	# into base-bits-dir as part of making the image.	24	# into base-bits-dir as part of making the image.
25		25
26	if [ "x$1" = "x-b" ]; then	26	if [ "x$1" = "x-b" ]; then
		27	bootable=true
27	# This is highly x86-centric and will be used directly below.	28	# This is highly x86-centric and will be used directly below.
28	bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"	29	bootopts="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"
29		30
30	# Make EFI system partition (should be done with makefs in the future)	31	# Make EFI system partition (should be done with makefs in the future)
31	dd if=/dev/zero of=efiboot.img bs=4k count=100	32	dd if=/dev/zero of=efiboot.img bs=4k count=100
Lines 38-48 if [ "x$1" = "x-b" ]; then Link Here
38	umount efi	39	umount efi
39	rmdir efi	40	rmdir efi
40	mdconfig -d -u $device	41	mdconfig -d -u $device
41	bootable="-o bootimage=i386;efiboot.img -o no-emul-boot $bootable"	42	bootopts="-o bootimage=i386;efiboot.img -o no-emul-boot $bootopts"
42		43
43	shift	44	shift
44	else	45	else
45	bootable=""	46	bootable=false
		47	bootopts=""
46	fi	48	fi
47		49
48	if [ $# -lt 3 ]; then	50	if [ $# -lt 3 ]; then
Lines 54-60 LABEL=`echo $1 \| tr '[:lower:]' '[:upper:]'`; shift Link Here
54	NAME=$1; shift	56	NAME=$1; shift
55		57
56	publisher="The FreeBSD Project. http://www.FreeBSD.org/"	58	publisher="The FreeBSD Project. http://www.FreeBSD.org/"
57	echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab	59	$bootable && echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
58	makefs -t cd9660 $bootable -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*	60	makefs -t cd9660 $bootopts -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*
59	rm $1/etc/fstab	61	$bootable && rm $1/etc/fstab
60	rm -f efiboot.img	62	rm -f efiboot.img

Lines 24-34 Link Here

(-)b/release/i386/mkisoimages.sh (-5 / +7 lines)
24	# into base-bits-dir as part of making the image.	24	# into base-bits-dir as part of making the image.
25		25
26	if [ "x$1" = "x-b" ]; then	26	if [ "x$1" = "x-b" ]; then
		27	bootable=true
27	# This is highly x86-centric and will be used directly below.	28	# This is highly x86-centric and will be used directly below.
28	bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"	29	bootopts="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"
29	shift	30	shift
30	else	31	else
31	bootable=""	32	bootable=false
		33	bootopts=""
32	fi	34	fi
33		35
34	if [ $# -lt 3 ]; then	36	if [ $# -lt 3 ]; then
Lines 40-45 LABEL=`echo $1 \| tr '[:lower:]' '[:upper:]'`; shift Link Here
40	NAME=$1; shift	42	NAME=$1; shift
41		43
42	publisher="The FreeBSD Project. http://www.FreeBSD.org/"	44	publisher="The FreeBSD Project. http://www.FreeBSD.org/"
43	echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab	45	$bootable && echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
44	makefs -t cd9660 $bootable -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*	46	makefs -t cd9660 $bootopts -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*
45	rm $1/etc/fstab	47	$bootable && rm $1/etc/fstab

Lines 24-34 Link Here

(-)b/release/pc98/mkisoimages.sh (-5 / +7 lines)
24	# into base-bits-dir as part of making the image.	24	# into base-bits-dir as part of making the image.
25		25
26	if [ "x$1" = "x-b" ]; then	26	if [ "x$1" = "x-b" ]; then
		27	bootable=true
27	# This is highly x86-centric and will be used directly below.	28	# This is highly x86-centric and will be used directly below.
28	bootable="-o generic-bootimage=$4/boot/cdboot"	29	bootopts="-o generic-bootimage=$4/boot/cdboot"
29	shift	30	shift
30	else	31	else
31	bootable=""	32	bootable=false
		33	bootopts=""
32	fi	34	fi
33		35
34	if [ $# -lt 3 ]; then	36	if [ $# -lt 3 ]; then
Lines 40-45 LABEL=`echo $1 \| tr '[:lower:]' '[:upper:]'`; shift Link Here
40	NAME=$1; shift	42	NAME=$1; shift
41		43
42	publisher="The FreeBSD Project. http://www.FreeBSD.org/"	44	publisher="The FreeBSD Project. http://www.FreeBSD.org/"
43	echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab	45	$bootable && echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
44	makefs -t cd9660 $bootable -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*	46	makefs -t cd9660 $bootopts -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*
45	rm $1/etc/fstab	47	$bootable && rm $1/etc/fstab

Lines 24-29 Link Here

(-)b/release/powerpc/mkisoimages.sh (-6 / +8 lines)
24	# into base-bits-dir as part of making the image.	24	# into base-bits-dir as part of making the image.
25		25
26	if [ "x$1" = "x-b" ]; then	26	if [ "x$1" = "x-b" ]; then
		27	bootable=true
27	# Apple boot code	28	# Apple boot code
28	uudecode -o /tmp/hfs-boot-block.bz2 `dirname $0`/hfs-boot.bz2.uu	29	uudecode -o /tmp/hfs-boot-block.bz2 `dirname $0`/hfs-boot.bz2.uu
29	bzip2 -d /tmp/hfs-boot-block.bz2	30	bzip2 -d /tmp/hfs-boot-block.bz2
Lines 31-37 if [ "x$1" = "x-b" ]; then Link Here
31	OFFSET=0x$(echo 0x$OFFSET \| awk '{printf("%x\n",$1/512);}')	32	OFFSET=0x$(echo 0x$OFFSET \| awk '{printf("%x\n",$1/512);}')
32	dd if=$4/boot/loader of=/tmp/hfs-boot-block seek=$OFFSET conv=notrunc	33	dd if=$4/boot/loader of=/tmp/hfs-boot-block seek=$OFFSET conv=notrunc
33		34
34	bootable="-o bootimage=macppc;/tmp/hfs-boot-block -o no-emul-boot"	35	bootopts="-o bootimage=macppc;/tmp/hfs-boot-block -o no-emul-boot"
35		36
36	# pSeries/PAPR boot code	37	# pSeries/PAPR boot code
37	mkdir -p $4/ppc/chrp	38	mkdir -p $4/ppc/chrp
Lines 43-56 if [ "x$1" = "x-b" ]; then Link Here
43	<boot-script>boot &device;:,\ppc\chrp\loader</boot-script>	44	<boot-script>boot &device;:,\ppc\chrp\loader</boot-script>
44	</chrp-boot>	45	</chrp-boot>
45	EOF	46	EOF
46	bootable="$bootable -o chrp-boot"	47	bootopts="$bootopts -o chrp-boot"
47		48
48	# Playstation 3 boot code	49	# Playstation 3 boot code
49	echo "FreeBSD Install='/boot/loader.ps3'" > $4/etc/kboot.conf	50	echo "FreeBSD Install='/boot/loader.ps3'" > $4/etc/kboot.conf
50		51
51	shift	52	shift
52	else	53	else
53	bootable=""	54	bootable=false
		55	bootopts=""
54	fi	56	fi
55		57
56	if [ $# -lt 3 ]; then	58	if [ $# -lt 3 ]; then
Lines 62-69 LABEL=`echo $1 \| tr '[:lower:]' '[:upper:]'`; shift Link Here
62	NAME=$1; shift	64	NAME=$1; shift
63		65
64	publisher="The FreeBSD Project. http://www.FreeBSD.org/"	66	publisher="The FreeBSD Project. http://www.FreeBSD.org/"
65	echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab	67	$bootable && echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
66	makefs -t cd9660 $bootable -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*	68	makefs -t cd9660 $bootopts -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*
67	rm $1/etc/fstab	69	$bootable && rm $1/etc/fstab
68	rm /tmp/hfs-boot-block	70	rm /tmp/hfs-boot-block
69	rm -rf $1/ppc	71	rm -rf $1/ppc

Lines 28-34 if [ $# -lt 3 ]; then Link Here

(-)b/release/sparc64/mkisoimages.sh (-3 / +3 lines)
28	fi	28	fi
29		29
30	case $1 in	30	case $1 in
31	-b) BOPT=$1; shift ;;	31	-b) BOPT=$1; bootable=true; shift ;;
32	esac	32	esac
33	LABEL=`echo $1 \| tr '[:lower:]' '[:upper:]'`; shift	33	LABEL=`echo $1 \| tr '[:lower:]' '[:upper:]'`; shift
34	NAME=$1; shift	34	NAME=$1; shift
Lines 36-44 BASEBITSDIR=$1 Link Here
36		36
37	# Create an ISO image	37	# Create an ISO image
38	publisher="The FreeBSD Project. http://www.FreeBSD.org/"	38	publisher="The FreeBSD Project. http://www.FreeBSD.org/"
39	echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "${BASEBITSDIR}/etc/fstab"	39	$bootable && echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "${BASEBITSDIR}/etc/fstab"
40	makefs -t cd9660 -o rockridge -o label="$LABEL" -o publisher="$publisher" ${NAME}.tmp $*	40	makefs -t cd9660 -o rockridge -o label="$LABEL" -o publisher="$publisher" ${NAME}.tmp $*
41	rm "${BASEBITSDIR}/etc/fstab"	41	$bootable && rm "${BASEBITSDIR}/etc/fstab"
42		42
43	if [ "x$BOPT" != "x-b" ]; then	43	if [ "x$BOPT" != "x-b" ]; then
44	mv ${NAME}.tmp ${NAME}	44	mv ${NAME}.tmp ${NAME}