svn commit: r273826 - in projects/release-vmimage/release: amd64 i386
Glen Barber
gjb at FreeBSD.org
Wed Oct 29 16:20:50 UTC 2014
Author: gjb
Date: Wed Oct 29 16:20:49 2014
New Revision: 273826
URL: https://svnweb.freebsd.org/changeset/base/273826
Log:
Remove a few vestiges of passing an exit code to
panic().
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-vmimage/release/amd64/mk-azure.sh
projects/release-vmimage/release/i386/mk-azure.sh
Modified: projects/release-vmimage/release/amd64/mk-azure.sh
==============================================================================
--- projects/release-vmimage/release/amd64/mk-azure.sh Wed Oct 29 16:18:29 2014 (r273825)
+++ projects/release-vmimage/release/amd64/mk-azure.sh Wed Oct 29 16:20:49 2014 (r273826)
@@ -78,7 +78,7 @@ vm_create_azure() {
mount /dev/${mddev} ${DESTDIR}
make -C ${WORLDDIR} DESTDIR=$(realpath ${DESTDIR}) \
installworld installkernel distribution || \
- panic 1 "\n\nCannot install the base system to ${DESTDIR}."
+ panic "\n\nCannot install the base system to ${DESTDIR}."
mount -t devfs devfs ${DESTDIR}/dev
chroot ${DESTDIR} /usr/bin/newaliases
echo '# Custom /etc/fstab for FreeBSD VM images' \
@@ -125,7 +125,7 @@ vm_create_azure() {
# This should never happen. But, it has happened.
msg="Cannot umount(8) ${DESTDIR}\n"
msg="${msg}Something has gone horribly wrong."
- panic 1 "${msg}"
+ panic "${msg}"
fi
sleep 1
done
Modified: projects/release-vmimage/release/i386/mk-azure.sh
==============================================================================
--- projects/release-vmimage/release/i386/mk-azure.sh Wed Oct 29 16:18:29 2014 (r273825)
+++ projects/release-vmimage/release/i386/mk-azure.sh Wed Oct 29 16:20:49 2014 (r273826)
@@ -78,7 +78,7 @@ vm_create_azure() {
mount /dev/${mddev} ${DESTDIR}
make -C ${WORLDDIR} DESTDIR=$(realpath ${DESTDIR}) \
installworld installkernel distribution || \
- panic 1 "\n\nCannot install the base system to ${DESTDIR}."
+ panic "\n\nCannot install the base system to ${DESTDIR}."
mount -t devfs devfs ${DESTDIR}/dev
chroot ${DESTDIR} /usr/bin/newaliases
echo '# Custom /etc/fstab for FreeBSD VM images' \
@@ -125,7 +125,7 @@ vm_create_azure() {
# This should never happen. But, it has happened.
msg="Cannot umount(8) ${DESTDIR}\n"
msg="${msg}Something has gone horribly wrong."
- panic 1 "${msg}"
+ panic "${msg}"
fi
sleep 1
done
More information about the svn-src-projects
mailing list