aboutsummaryrefslogtreecommitdiff
path: root/release/powerpc
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2016-01-05 21:05:17 +0000
committerGlen Barber <gjb@FreeBSD.org>2016-01-05 21:05:17 +0000
commit8834318685bc0063c7e5c8643cbd4d8168eac56c (patch)
tree8337325a8f7623b8920901e3734301b0b26c68fb /release/powerpc
parentbd81fe68ee5c1e0b044670ea5f1757d1c1c222c9 (diff)
downloadsrc-8834318685bc0063c7e5c8643cbd4d8168eac56c.tar.gz
src-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/powerpc')
-rw-r--r--release/powerpc/mkisoimages.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/release/powerpc/mkisoimages.sh b/release/powerpc/mkisoimages.sh
index c92072d11d7f..e69f32dd634d 100644
--- a/release/powerpc/mkisoimages.sh
+++ b/release/powerpc/mkisoimages.sh
@@ -64,6 +64,6 @@ 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 /tmp/hfs-boot-block
+rm -f "$1/etc/fstab"
+rm -f /tmp/hfs-boot-block
rm -rf "$1/ppc"