diff options
Diffstat (limited to 'usr.sbin/bsdconfig/share/media/ufs.subr')
-rw-r--r-- | usr.sbin/bsdconfig/share/media/ufs.subr | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/usr.sbin/bsdconfig/share/media/ufs.subr b/usr.sbin/bsdconfig/share/media/ufs.subr index 2de29b3..a16b53d 100644 --- a/usr.sbin/bsdconfig/share/media/ufs.subr +++ b/usr.sbin/bsdconfig/share/media/ufs.subr @@ -67,7 +67,7 @@ f_media_set_ufs() local devs ndevs f_device_find "" $DEVICE_TYPE_UFS devs - ndevs=$( set -- $devs; echo $# ) + f_count ndevs $devs if [ ${ndevs:=0} -eq 0 ]; then f_variable_get_value $VAR_UFS_PATH \ @@ -117,6 +117,7 @@ f_media_set_ufs() # f_media_init_ufs() { + local funcname=f_media_init_ufs local dev="$1" devname err device_$dev get devname devname || return $FAILURE @@ -134,14 +135,13 @@ f_media_init_ufs() return $FAILURE fi - if [ ! -e "$MOUNTPOINT" ] && - ! err=$( mkdir -p "$MOUNTPOINT" 2>&1 ) - then - f_dialog_msgbox "$err" - return $FAILURE + if [ ! -e "$MOUNTPOINT" ]; then + f_eval_catch $funcname mkdir 'mkdir -p "%s"' "$MOUNTPOINT" || + return $FAILURE fi - if ! err=$( mount "$devname" "$MOUNTPOINT" 2>&1 ) + if ! f_eval_catch -dk err $funcname mount \ + 'mount "%s" "%s"' "$devname" "$MOUNTPOINT" then err="${err#mount: }"; err="${err#$devname : }" f_show_msg "$msg_error_mounting_device" \ @@ -175,11 +175,14 @@ f_media_get_ufs() # f_media_shutdown_ufs() { + local funcname=f_media_shutdown_ufs local dev="$1" err [ "$UFS_MOUNTED" ] || return $FAILURE - if ! err=$( umount -f "$MOUNTPOINT" 2>&1 ); then + if ! f_eval_catch -dk err $funcname umount \ + 'umount -f "%s"' "$MOUNTPOINT" + then err="${err#umount: }"; err="${err#*: }" f_show_msg "$msg_could_not_unmount_the_ufs_partition" \ "$MOUNTPOINT" "$err" |