Module Name: src
Committed By: jmcneill
Date: Mon Jan 14 12:12:19 UTC 2013
Modified Files:
src/distrib/utils/embedded: mkimage
Log Message:
move 'trap' after command args are parsed
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/embedded/mkimage
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/mkimage
diff -u src/distrib/utils/embedded/mkimage:1.7 src/distrib/utils/embedded/mkimage:1.8
--- src/distrib/utils/embedded/mkimage:1.7 Sun Jan 13 21:51:47 2013
+++ src/distrib/utils/embedded/mkimage Mon Jan 14 12:12:19 2013
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: mkimage,v 1.7 2013/01/13 21:51:47 christos Exp $
+# $NetBSD: mkimage,v 1.8 2013/01/14 12:12:19 jmcneill Exp $
# Copyright (c) 2012 Alistair Crooks <a...@netbsd.org>
# All rights reserved.
@@ -102,7 +102,6 @@ finish() {
${sudo} vnconfig -u ${vnddev}
}
-trap finish 0 1 2 3 15
DIR="$(dirname "$0")"
PROG="$(basename "$0")"
bar="==="
@@ -147,6 +146,8 @@ do
esac
done
+trap finish 0 1 2 3 15
+
shift $(( "$OPTIND" - 1 ))
if [ -n "$1" ]; then
# take the next argument as being the image name
