misc/162338: POLA: mkisoimages.sh does not support extra-bits-dir
parameter
Alexander Sack
alex at niksun.com
Sun Nov 6 18:30:12 UTC 2011
>Number: 162338
>Category: misc
>Synopsis: POLA: mkisoimages.sh does not support extra-bits-dir parameter
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Nov 06 18:30:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Alexander Sack
>Release: 9.0RC1
>Organization:
Niksun, Inc.
>Environment:
FreeBSD insomnium 9.0-BETA1 FreeBSD 9.0-BETA1 #0: Thu Jul 28 17:15:31 UTC 2011 root at farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
The release/amd64/mkisoimages.sh script is suppose to support an extra-bits-dir argument. Because the script now uses makefs instead of mkisofs, extra-bits-dir is no longer supported.
Patch below.
>How-To-Repeat:
Call mkisoimages.sh with an extra argument results in failure.
>Fix:
Patch submitted for review. Patch honors an extra-bits-dir argument before creating the ISO.
Patch attached with submission follows:
--- ../../../vendor/freebsd/dist/release/amd64/mkisoimages.sh 2011-10-18 10:40:26.000000000 -0400
+++ mkisoimages.sh 2011-11-06 08:41:32.000000000 -0500
@@ -38,7 +39,14 @@
LABEL=$1; shift
NAME=$1; shift
+BASE=$1; shift
+EXTRA=$1; shift
-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
+# If extra-bits-dir was passed and its a valid directory, include its contents.
+if [ -d "$EXTRA" ]; then
+ cp -a $EXTRA/ $BASE || exit 1
+fi
+
+echo "/dev/iso9660/`echo $LABEL | tr '[:lower:]' '[:upper:]'` / cd9660 ro 0 0" > $BASE/etc/fstab
+makefs -t cd9660 $bootable -o rockridge -o label=$LABEL $NAME $BASE
+rm $BASE/etc/fstab
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-bugs
mailing list