build/dvd: the script formerly known as cdrom

After much discussion and questions, we move to a DVD-ish nomenclature
to indicate that images are likely oversized for a CD. In any case,
the Virtual Machines don't care about this, but users deciding to try
OPNsense might.

Now is the time as the next images are likely going to be for 17.7.

Makefile

@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-STEPS=		base boot cdrom chroot clean core distfiles info \
+STEPS=		base boot chroot clean core distfiles dvd info \
 		kernel nano plugins ports prefetch print rebase \
 		release rename serial sign skim test update verify \
 		vga vm xtools
@@ -88,10 +88,10 @@ ports distfiles: base
 plugins: ports
 core: plugins
 packages test: core
-cdrom vm serial vga nano: packages kernel
+dvd nano serial vga vm: packages kernel
 sets: distfiles packages kernel
-images: cdrom nano serial vga vm
-release: cdrom nano serial vga
+images: dvd nano serial vga vm
+release: dvd nano serial vga
 
 # Expand target arguments for the script append:
 

README.md

@@ -26,9 +26,9 @@ tasks require a root user.  Do the following to grab the repositories
 TL;DR
 =====
 
-    # make cdrom
+    # make dvd
 
-If successful, a cdrom image can be found here: /tmp/images
+If successful, a dvd image can be found here: /tmp/images
 
 Detailed build steps and options
 ================================
@@ -89,23 +89,23 @@ Wrap up our core as a package:
 
     # make core
 
-A cdrom live image is created using:
+A dvd live image is created using:
 
-    # make cdrom
+    # make dvd
 
-A serial memstick image is created using:
+A serial memstick live image is created using:
 
     # make serial
 
-A vga memstick image is created using:
+A vga memstick live image is created using:
 
     # make vga
 
-A flash card disk image is created using:
+A flash card full disk image is created using:
 
     # make nano
 
-A virtual machine disk image is created using:
+A virtual machine full disk image is created using:
 
     # make vm
 
@@ -151,7 +151,7 @@ define hooks in the form of e.g.:
     }
 
 These hooks are available for all image types, namely
-cdrom, nano, serial, vga and vm.  Device-specific hooks
+dvd, nano, serial, vga and vm.  Device-specific hooks
 are loaded after config-specific hooks and both of them
 can coexist in a given build.
 
@@ -245,7 +245,7 @@ Available clean options are:
 
 * base:		remove base set
 * distfiles:	remove distfiles set
-* cdrom:	remove cdrom image
+* dvd:		remove dvd image
 * core:		remove core from packages set
 * images:	remove all images
 * kernel:	remove kernel set

build/clean.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2014-2016 Franco Fichtner <franco@opnsense.org>
+# Copyright (c) 2014-2017 Franco Fichtner <franco@opnsense.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -37,9 +37,9 @@ for ARG in ${@}; do
 		echo ">>> Removing base set"
 		rm -f ${SETSDIR}/base-*-${PRODUCT_ARCH}.*
 		;;
-	cdrom)
-		echo ">>> Removing cdrom image"
-		rm -f ${IMAGESDIR}/*-cdrom-${PRODUCT_ARCH}.*
+	dvd)
+		echo ">>> Removing dvd image"
+		rm -f ${IMAGESDIR}/*-dvd-${PRODUCT_ARCH}.*
 		;;
 	core)
 		echo ">>> Removing core from packages set"

build/dvd.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2014-2016 Franco Fichtner <franco@opnsense.org>
+# Copyright (c) 2014-2017 Franco Fichtner <franco@opnsense.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -27,13 +27,13 @@
 
 set -e
 
-SELF=cdrom
+SELF=dvd
 
 . ./common.sh && $(${SCRUB_ARGS})
 
 check_images ${SELF} ${@}
 
-CDROM="${IMAGESDIR}/${PRODUCT_RELEASE}-cdrom-${PRODUCT_ARCH}.iso"
+DVD="${IMAGESDIR}/${PRODUCT_RELEASE}-dvd-${PRODUCT_ARCH}.iso"
 
 # rewrite the disk label, because we're install media
 LABEL="${LABEL}_Install"
@@ -67,7 +67,7 @@ if [ ${PRODUCT_ARCH} = "amd64" -a -n "${PRODUCT_UEFI}" ]; then
 	UEFIBOOT="${UEFIBOOT} -o no-emul-boot"
 fi
 
-echo -n ">>> Building cdrom image... "
+echo -n ">>> Building dvd image... "
 
 cat > ${STAGEDIR}/work/etc/fstab << EOF
 # Device	Mountpoint	FStype	Options	Dump	Pass #
@@ -77,6 +77,6 @@ EOF
 
 makefs -t cd9660 ${UEFIBOOT} \
     -o 'bootimage=i386;'"${STAGEDIR}"'/work/boot/cdboot' -o no-emul-boot \
-    -o label=${LABEL} -o rockridge ${CDROM} ${STAGEDIR}/work
+    -o label=${LABEL} -o rockridge ${DVD} ${STAGEDIR}/work
 
 echo "done"

config/17.1/extras.conf

@@ -10,7 +10,7 @@ kern.cam.boot_delay="10000"
 EOF
 }
 
-cdrom_hook()
+dvd_hook()
 {
 	loader_conf_fixup ${1}
 }