diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2016-01-05 21:05:17 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2016-01-05 21:05:17 +0000 |
| commit | 8834318685bc0063c7e5c8643cbd4d8168eac56c (patch) | |
| tree | 8337325a8f7623b8920901e3734301b0b26c68fb /release/amd64 | |
| parent | bd81fe68ee5c1e0b044670ea5f1757d1c1c222c9 (diff) | |
| download | src-test-8834318685bc0063c7e5c8643cbd4d8168eac56c.tar.gz src-test-8834318685bc0063c7e5c8643cbd4d8168eac56c.zip | |
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
Notes
Notes:
svn path=/head/; revision=293223
Diffstat (limited to 'release/amd64')
| -rw-r--r-- | release/amd64/mkisoimages.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/amd64/mkisoimages.sh b/release/amd64/mkisoimages.sh index 755fb526f1cf1..f72dd9e64d826 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 |