aboutsummaryrefslogtreecommitdiff
path: root/release/i386/mkisoimages.sh
diff options
context:
space:
mode:
authorNathan Whitehorn <nwhitehorn@FreeBSD.org>2011-05-04 23:41:11 +0000
committerNathan Whitehorn <nwhitehorn@FreeBSD.org>2011-05-04 23:41:11 +0000
commitcf6ba592c5e77662ea50c24228345f8cc4462f5c (patch)
treebe36122c45b7bcd46fffada194de96a1a955efc4 /release/i386/mkisoimages.sh
parentd16401694fb301f8fa6341077c2d3b11627365dd (diff)
downloadsrc-cf6ba592c5e77662ea50c24228345f8cc4462f5c.tar.gz
src-cf6ba592c5e77662ea50c24228345f8cc4462f5c.zip
Repair release CD generation on PC98 and sun4v after release building
changes, and backport the new logic (ISO images are TARGET dependant, not TARGET_CPUARCH dependant) to Makefile.sysinstall. While modifying ISO image scripts, change several archs to use makefs (from base) instead of mkisofs (from ports) which makes release CD generation both faster and self-hosting.
Notes
Notes: svn path=/head/; revision=221466
Diffstat (limited to 'release/i386/mkisoimages.sh')
-rw-r--r--release/i386/mkisoimages.sh28
1 files changed, 5 insertions, 23 deletions
diff --git a/release/i386/mkisoimages.sh b/release/i386/mkisoimages.sh
index d5570dcc4165..384f44fb6b3d 100644
--- a/release/i386/mkisoimages.sh
+++ b/release/i386/mkisoimages.sh
@@ -24,40 +24,22 @@
# into base-bits-dir as part of making the image.
publisher="The FreeBSD Project. http://www.freebsd.org/"
-
if [ "x$1" = "x-b" ]; then
- bootable="-b boot/cdboot -no-emul-boot"
- shift
-elif [ "x$1" = "x-G" ]; then
- bootable="-G /R/cdrom/bootonly/boot/cdboot"
+ # This is highly x86-centric and will be used directly below.
+ bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"
shift
else
bootable=""
fi
if [ $# -lt 3 ]; then
- echo Usage: $0 '[-bG] 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
-type mkisofs 2>&1 | grep " is " >/dev/null
-if [ $? -ne 0 ]; then
- echo The cdrtools port is not installed. Trying to get it now.
- if [ -f /usr/ports/sysutils/cdrtools/Makefile ]; then
- cd /usr/ports/sysutils/cdrtools && make install BATCH=yes && make clean
- else
- if ! pkg_add -r cdrtools; then
- echo "Could not get it via pkg_add - please go install this"
- echo "from the ports collection and run this script again."
- exit 2
- fi
- fi
-fi
-
LABEL=$1; shift
NAME=$1; shift
-echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
-mkisofs $bootable -r -J -V $LABEL -publisher "$publisher" -o $NAME $*
+echo "/dev/iso9660/`echo $LABEL | tr '[:lower:]' '[:upper:]'` / cd9660 ro 0 0" > $1/etc/fstab
+makefs -t cd9660 $bootable -o rockridge -o label=$LABEL $NAME $*
rm $1/etc/fstab
-