27c27
< # $FreeBSD: head/usr.sbin/bsdconfig/share/media/ftp.subr 259054 2013-12-07 00:31:01Z dteske $
---
> # $FreeBSD: head/usr.sbin/bsdconfig/share/media/ftp.subr 264840 2014-04-23 22:04:04Z dteske $
331c331
< f_device_shutdown network
---
> f_device_shutdown device_network
336,338c336,339
< 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
340c341
< if ! f_device_init network; then
---
> if ! f_device_init device_network; then
423c424
< f_device_shutdown network
---
> f_device_shutdown device_network
439c440
< device_ftp set private network
---
> device_ftp set private device_network
506,507c507,509
< 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]"
518,519c520,521
< f_struct device_$dev || return $FAILURE
< device_$dev get private netDev || return $SUCCESS
---
> f_struct "$dev" || return $FAILURE
> $dev get private netDev || return $SUCCESS
579d580
<
581c582,583
< device_$dev get name url
---
>
> $dev get name url
727d728
< BEGIN { found = 0 }
< # $FreeBSD: head/usr.sbin/bsdconfig/share/media/ftp.subr 259054 2013-12-07 00:31:01Z dteske $
---
> # $FreeBSD: head/usr.sbin/bsdconfig/share/media/ftp.subr 264840 2014-04-23 22:04:04Z dteske $
331c331
< f_device_shutdown network
---
> f_device_shutdown device_network
336,338c336,339
< 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
340c341
< if ! f_device_init network; then
---
> if ! f_device_init device_network; then
423c424
< f_device_shutdown network
---
> f_device_shutdown device_network
439c440
< device_ftp set private network
---
> device_ftp set private device_network
506,507c507,509
< 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]"
518,519c520,521
< f_struct device_$dev || return $FAILURE
< device_$dev get private netDev || return $SUCCESS
---
> f_struct "$dev" || return $FAILURE
> $dev get private netDev || return $SUCCESS
579d580
<
581c582,583
< device_$dev get name url
---
>
> $dev get name url
727d728
< BEGIN { found = 0 }