summaryrefslogtreecommitdiffstats
path: root/release/amd64
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2016-01-05 21:05:17 +0000
committergjb <gjb@FreeBSD.org>2016-01-05 21:05:17 +0000
commitb2615ed1dd96333aade468efd8160d77963c2ffe (patch)
tree8337325a8f7623b8920901e3734301b0b26c68fb /release/amd64
parenta3773027801dbe529556217f884d89d8f87154a5 (diff)
downloadFreeBSD-src-b2615ed1dd96333aade468efd8160d77963c2ffe.zip
FreeBSD-src-b2615ed1dd96333aade468efd8160d77963c2ffe.tar.gz
Merge ^/projects/release-install-debug:
- Rework MANIFEST generation and parsing via bsdinstall(8). - Allow selecting debugging distribution sets during install. - Rework bsdinstall(8) to fetch remote debug distribution sets when they are not available on the local install medium. - Allow selecting additional non-GENERIC kernels during install. At present, GENERIC is still required, and installed by default. Tested with: head@r293203 Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release/amd64')
-rw-r--r--release/amd64/mkisoimages.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/amd64/mkisoimages.sh b/release/amd64/mkisoimages.sh
index 755fb52..f72dd9e 100644
--- a/release/amd64/mkisoimages.sh
+++ b/release/amd64/mkisoimages.sh
@@ -56,5 +56,5 @@ NAME="$1"; shift
publisher="The FreeBSD Project. http://www.FreeBSD.org/"
echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$1/etc/fstab"
makefs -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$@"
-rm "$1/etc/fstab"
+rm -f "$1/etc/fstab"
rm -f efiboot.img
OpenPOWER on IntegriCloud