summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordteske <dteske@FreeBSD.org>2013-06-18 08:22:51 +0000
committerdteske <dteske@FreeBSD.org>2013-06-18 08:22:51 +0000
commit601ac9fa2e723e751ccd3ad04a9f5fd67ba363f1 (patch)
tree34cff215369429c02d5dbba7de5427eacd394ea4
parent78fd2f6d07efa80a37bbbbe4760bab787cf85f73 (diff)
downloadFreeBSD-src-601ac9fa2e723e751ccd3ad04a9f5fd67ba363f1.zip
FreeBSD-src-601ac9fa2e723e751ccd3ad04a9f5fd67ba363f1.tar.gz
Oops, in SVN r251905 I forgot that f_die takes the return code as the first
argument (not the format).
-rwxr-xr-xusr.sbin/bsdconfig/console/font2
-rwxr-xr-xusr.sbin/bsdconfig/console/keymap2
-rwxr-xr-xusr.sbin/bsdconfig/console/repeat2
-rwxr-xr-xusr.sbin/bsdconfig/console/saver2
-rwxr-xr-xusr.sbin/bsdconfig/console/screenmap2
5 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/bsdconfig/console/font b/usr.sbin/bsdconfig/console/font
index 3310f4c..aedd0b4 100755
--- a/usr.sbin/bsdconfig/console/font
+++ b/usr.sbin/bsdconfig/console/font
@@ -172,7 +172,7 @@ case "$mtag" in
f8="swiss-8x8" f14="NO" f16="swiss-8x16" ;;
esac
-[ "$f8" -a "$f14" -a "$f16" ] || f_die "$msg_unknown_font_selection"
+[ "$f8" -a "$f14" -a "$f16" ] || f_die 1 "$msg_unknown_font_selection"
f_sysrc_set font8x8 "$f8" || f_die
f_sysrc_set font8x14 "$f14" || f_die
diff --git a/usr.sbin/bsdconfig/console/keymap b/usr.sbin/bsdconfig/console/keymap
index eba2870..e81176f 100755
--- a/usr.sbin/bsdconfig/console/keymap
+++ b/usr.sbin/bsdconfig/console/keymap
@@ -322,7 +322,7 @@ while :; do
f_sysrc_set keymap "$keymap_to_set" || f_die
break
else
- f_die "$msg_unknown_keymap"
+ f_die 1 "$msg_unknown_keymap"
fi
done
diff --git a/usr.sbin/bsdconfig/console/repeat b/usr.sbin/bsdconfig/console/repeat
index b8d979f..838403b 100755
--- a/usr.sbin/bsdconfig/console/repeat
+++ b/usr.sbin/bsdconfig/console/repeat
@@ -132,7 +132,7 @@ if [ "$repeat_rate_to_set" ]; then
f_sysrc_set keyrate "$repeat_rate_to_set" || f_die
break
else
- f_die "$msg_unknown_repeat_rate"
+ f_die 1 "$msg_unknown_repeat_rate"
fi
exit $SUCCESS
diff --git a/usr.sbin/bsdconfig/console/saver b/usr.sbin/bsdconfig/console/saver
index 3994dcf..912fd4a 100755
--- a/usr.sbin/bsdconfig/console/saver
+++ b/usr.sbin/bsdconfig/console/saver
@@ -183,7 +183,7 @@ if [ "$saver_to_set" ]; then
f_sysrc_set saver "$saver_to_set" || f_die
break
else
- f_die "$msg_unknown_saver"
+ f_die 1 "$msg_unknown_saver"
fi
exit $SUCCESS
diff --git a/usr.sbin/bsdconfig/console/screenmap b/usr.sbin/bsdconfig/console/screenmap
index 04db353..94e5ba8 100755
--- a/usr.sbin/bsdconfig/console/screenmap
+++ b/usr.sbin/bsdconfig/console/screenmap
@@ -144,7 +144,7 @@ if [ "$scrnmap_to_set" ]; then
f_sysrc_set scrnmap "$scrnmap_to_set" || f_die
break
else
- f_die "$msg_unknown_screenmap_selection"
+ f_die 1 "$msg_unknown_screenmap_selection"
fi
exit $SUCCESS
OpenPOWER on IntegriCloud