summaryrefslogtreecommitdiffstats
path: root/usr.sbin/bsdconfig/networking/share/media.subr
diff options
context:
space:
mode:
authordteske <dteske@FreeBSD.org>2013-07-05 23:16:56 +0000
committerdteske <dteske@FreeBSD.org>2013-07-05 23:16:56 +0000
commitf98492d5e216ae4340ac038c07cefbc31dd7a6c9 (patch)
treec80de8ad188b11d3968ad2228dc00844ba368eb9 /usr.sbin/bsdconfig/networking/share/media.subr
parenta9fa8698ffd1caaec1b00c94dbabca108bcf2239 (diff)
downloadFreeBSD-src-f98492d5e216ae4340ac038c07cefbc31dd7a6c9.zip
FreeBSD-src-f98492d5e216ae4340ac038c07cefbc31dd7a6c9.tar.gz
Don't prevent the user from hanging their system by changing network
settings while NFS mounts are active; but DO warn them and make the default action to do nothing. (thanks julian)
Diffstat (limited to 'usr.sbin/bsdconfig/networking/share/media.subr')
-rw-r--r--usr.sbin/bsdconfig/networking/share/media.subr8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/bsdconfig/networking/share/media.subr b/usr.sbin/bsdconfig/networking/share/media.subr
index 22073d7..36d811f 100644
--- a/usr.sbin/bsdconfig/networking/share/media.subr
+++ b/usr.sbin/bsdconfig/networking/share/media.subr
@@ -117,8 +117,8 @@ f_dialog_input_options()
if f_nfs_mounted && ! f_jailed; then
local setting="$( printf "$msg_current_options" \
"$interface" "$options" )"
- f_show_msg "$msg_nfs_mounts_may_cause_hang" "$setting"
- return $FAILURE
+ f_noyes "$msg_nfs_mounts_may_cause_hang" "$setting" ||
+ return $FAILURE
fi
local msg="$( printf "$msg_please_enter_mediaopts" "$interface" )"
@@ -164,8 +164,8 @@ f_dialog_menu_media_options()
if f_nfs_mounted && ! f_jailed; then
local setting="$( printf "$msg_current_options" \
"$interface" "$_options" )"
- f_show_msg "$msg_nfs_mounts_may_cause_hang" "$setting"
- return $FAILURE
+ f_noyes "$msg_nfs_mounts_may_cause_hang" "$setting" ||
+ return $FAILURE
fi
#
OpenPOWER on IntegriCloud