MFC r264840: Implement GEOM based media device classification.

1 files changed, 13 insertions, 10 deletions

diff --git a/usr.sbin/bsdconfig/share/media/nfs.subr b/usr.sbin/bsdconfig/share/media/nfs.subr
index 33b37c8..d83661f 100644
--- a/usr.sbin/bsdconfig/share/media/nfs.subr
+++ b/usr.sbin/bsdconfig/share/media/nfs.subr
@@ -93,13 +93,14 @@ f_media_set_nfs()
 	   ! f_dialog_yesno "$msg_youve_already_done_the_network_configuration"
 	then
 		f_struct device_network &&
-			f_device_shutdown network
+			f_device_shutdown device_network
 		f_device_select_tcp || return $FAILURE
-		local dev
-		f_getvar $VAR_NETWORK_DEVICE dev
-		f_struct_copy "device_$dev" device_network
+		local dev if
+		f_getvar $VAR_NETWORK_DEVICE if
+		f_device_find -1 "$if" $DEVICE_TYPE_NETWORK dev
+		f_struct_copy "$dev" device_network
 	fi
-	f_device_init network ||
+	f_device_init device_network ||
 		f_dprintf "%s: $msg_net_device_init_failed\n" f_media_set_nfs
 
 	local hostname="${nfs%%:*}"
@@ -112,7 +113,7 @@ f_media_set_nfs()
 		if ! f_quietly f_host_lookup "$hostname"; then
 			f_show_msg "$msg_cannot_resolve_hostname" "$hostname"
 			f_struct device_network &&
-				f_device_shutdown network
+				f_device_shutdown device_network
 			f_struct_free device_network
 			unset $VAR_NFS_PATH
 			return $FAILURE
@@ -157,7 +158,7 @@ f_media_init_nfs()
 	local funcname=f_media_init_nfs
 	local dev="$1" name err
 
-	device_$dev get name name || return $FAILURE
+	$dev get name name || return $FAILURE
 	f_dprintf "Init routine called for NFS device. name=[%s]" \
 	          "$name"
 
@@ -166,7 +167,7 @@ f_media_init_nfs()
 		return $SUCCESS
 	fi
 
-	if ! f_device_init network; then
+	if ! f_device_init device_network; then
 		f_dprintf "f_media_init_nfs: %s" "$msg_net_device_init_failed"
 		return $FAILURE
 	fi
@@ -198,7 +199,7 @@ f_media_init_nfs()
 		f_show_msg "$msg_error_mounting_device" \
 		           "$name" "$MOUNTPOINT" "$err"
 		f_struct device_network &&
-			f_device_shutdown network
+			f_device_shutdown device_network
 		return $FAILURE
 	fi
 	NFS_MOUNTED=1
@@ -218,9 +219,11 @@ f_media_init_nfs()
 f_media_get_nfs()
 {
 	local dev="$1" file="$2" probe_type="$3"
+	local name
 
+	$dev get name name
 	f_dprintf "f_media_get_nfs: dev=[%s] file=[%s] probe_type=%s" \
-	          "$dev" "$file" "$probe_type"
+	          "$name" "$file" "$probe_type"
 
 	f_media_generic_get "$MOUNTPOINT" "$file" "$probe_type"
 }