Author: dteske
Date: Tue Jun 18 08:22:51 2013
New Revision: 251907
URL: http://svnweb.freebsd.org/changeset/base/251907
Log:
Oops, in SVN r251905 I forgot that f_die takes the return code as the first
argument (not the format).
Modified:
head/usr.sbin/bsdconfig/console/font
head/usr.sbin/bsdconfig/console/keymap
head/usr.sbin/bsdconfig/console/repeat
head/usr.sbin/bsdconfig/console/saver
head/usr.sbin/bsdconfig/console/screenmap
Modified: head/usr.sbin/bsdconfig/console/font
==============================================================================
--- head/usr.sbin/bsdconfig/console/font Tue Jun 18 08:15:56 2013
(r251906)
+++ head/usr.sbin/bsdconfig/console/font Tue Jun 18 08:22:51 2013
(r251907)
@@ -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
Modified: head/usr.sbin/bsdconfig/console/keymap
==============================================================================
--- head/usr.sbin/bsdconfig/console/keymap Tue Jun 18 08:15:56 2013
(r251906)
+++ head/usr.sbin/bsdconfig/console/keymap Tue Jun 18 08:22:51 2013
(r251907)
@@ -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
Modified: head/usr.sbin/bsdconfig/console/repeat
==============================================================================
--- head/usr.sbin/bsdconfig/console/repeat Tue Jun 18 08:15:56 2013
(r251906)
+++ head/usr.sbin/bsdconfig/console/repeat Tue Jun 18 08:22:51 2013
(r251907)
@@ -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
Modified: head/usr.sbin/bsdconfig/console/saver
==============================================================================
--- head/usr.sbin/bsdconfig/console/saver Tue Jun 18 08:15:56 2013
(r251906)
+++ head/usr.sbin/bsdconfig/console/saver Tue Jun 18 08:22:51 2013
(r251907)
@@ -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
Modified: head/usr.sbin/bsdconfig/console/screenmap
==============================================================================
--- head/usr.sbin/bsdconfig/console/screenmap Tue Jun 18 08:15:56 2013
(r251906)
+++ head/usr.sbin/bsdconfig/console/screenmap Tue Jun 18 08:22:51 2013
(r251907)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
