diff options
| author | dteske <dteske@FreeBSD.org> | 2014-05-17 03:28:43 +0000 |
|---|---|---|
| committer | dteske <dteske@FreeBSD.org> | 2014-05-17 03:28:43 +0000 |
| commit | 5dd59bc6ac2020fbc6c987fd0b4fb2bb70daa35b (patch) | |
| tree | ae02a3cfcc3e67aa5b92565199400cd2cfc2879a /usr.sbin/bsdconfig/share/media/ftp.subr | |
| parent | 0f7f48b5f92ced3835af73951a1c1d6a463829e4 (diff) | |
| download | FreeBSD-src-5dd59bc6ac2020fbc6c987fd0b4fb2bb70daa35b.zip FreeBSD-src-5dd59bc6ac2020fbc6c987fd0b4fb2bb70daa35b.tar.gz | |
MFC r264840: Implement GEOM based media device classification.
Diffstat (limited to 'usr.sbin/bsdconfig/share/media/ftp.subr')
| -rw-r--r-- | usr.sbin/bsdconfig/share/media/ftp.subr | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/usr.sbin/bsdconfig/share/media/ftp.subr b/usr.sbin/bsdconfig/share/media/ftp.subr index 7f5256a3..a249a01 100644 --- a/usr.sbin/bsdconfig/share/media/ftp.subr +++ b/usr.sbin/bsdconfig/share/media/ftp.subr @@ -328,16 +328,17 @@ f_media_set_ftp() ! f_dialog_yesno "$msg_youve_already_done_the_network_configuration" then f_struct device_network && - f_device_shutdown network + f_device_shutdown device_network if ! f_device_select_tcp; then unset $VAR_FTP_PATH return $FAILURE fi - 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 - if ! f_device_init network; then + if ! f_device_init device_network; then f_dprintf "f_media_set_ftp: %s" "$msg_net_device_init_failed" unset $VAR_FTP_PATH return $FAILURE @@ -420,7 +421,7 @@ f_media_set_ftp() 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_FTP_PATH return $FAILURE @@ -436,7 +437,7 @@ f_media_set_ftp() device_ftp set init f_media_init_ftp device_ftp set get f_media_get_ftp device_ftp set shutdown f_media_shutdown_ftp - device_ftp set private network + device_ftp set private device_network f_struct_copy device_ftp device_media f_struct_free device_ftp @@ -503,8 +504,9 @@ f_media_set_ftp_userpass() f_device_network_up() { local dev="$1" netDev - f_struct device_$dev || return $FAILURE - device_$dev get private netDev || return $SUCCESS # No net == happy net + f_struct "$dev" || return $FAILURE + $dev get private netDev || return $SUCCESS # No net == happy net +debug=1 f_dprintf "netDev=[$netDev]" f_device_init $netDev } @@ -515,8 +517,8 @@ f_device_network_up() f_device_network_down() { local dev="$1" netDev - f_struct device_$dev || return $FAILURE - device_$dev get private netDev || return $SUCCESS + f_struct "$dev" || return $FAILURE + $dev get private netDev || return $SUCCESS f_device_shutdown $netDev } @@ -576,9 +578,9 @@ f_device_network_down() f_media_init_ftp() { local dev="$1" - local url - device_$dev get name url + + $dev get name url f_dprintf "Init routine called for FTP device. url=[%s]" "$url" if [ "$FTP_INITIALIZED" ]; then @@ -724,7 +726,6 @@ f_media_init_ftp() local fdir if fdir=$( echo "$rx" | awk ' - BEGIN { found = 0 } /^Remote directory: / { sub(/^[^:]*:[[:space:]]*/, "") if ($0 == "/") next |
