27c27
< # $FreeBSD: head/usr.sbin/bsdconfig/share/media/floppy.subr 259054 2013-12-07 00:31:01Z dteske $
---
> # $FreeBSD: head/usr.sbin/bsdconfig/share/media/floppy.subr 264840 2014-04-23 22:04:04Z dteske $
65c65,68
< elif [ $ndevs -gt 1 ]; then
---
> elif [ $ndevs -eq 1 ]; then
> f_struct_copy $devs device_media
> else
> local dev
68c71
< local hline=""
---
> local hline=
70d72
< local dev retval
73,75c75,76
< 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD )
< retval=$?
< [ "$dev" ] || return $FAILURE
---
> 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD ) ||
> return $FAILURE
77,84c78
< f_device_find "$dev" $DEVICE_TYPE_FLOPPY devs
< [ "$devs" ] || return $FAILURE
< dev="${devs%%[$IFS]*}"
<
< f_struct_copy device_$dev device_media
< [ $retval -eq $SUCCESS ] || return $FAILURE
< else
< f_struct_copy device_$devs device_media
---
> f_struct_copy "$dev" device_media
104c98
< device_$dev get devname devname || return $FAILURE
---
> $dev get devname devname || return $FAILURE
114c108
< device_$dev get private mp
---
> $dev get private mp
123c117
< device_$dev get desc desc
---
> $dev get desc desc
141c135
< device_$dev get name name
---
> $dev get name name
161a156
> local name
162a158
> $dev get name name
164c160
< "$dev" "$file" "$probe_type"
---
> "$name" "$file" "$probe_type"
172c168
< device_$dev get private mp
---
> $dev get private mp
216c212
< device_$dev get private mp
---
> $dev get private mp
223c219
< device_$dev get desc desc
---
> $dev get desc desc
< # $FreeBSD: head/usr.sbin/bsdconfig/share/media/floppy.subr 259054 2013-12-07 00:31:01Z dteske $
---
> # $FreeBSD: head/usr.sbin/bsdconfig/share/media/floppy.subr 264840 2014-04-23 22:04:04Z dteske $
65c65,68
< elif [ $ndevs -gt 1 ]; then
---
> elif [ $ndevs -eq 1 ]; then
> f_struct_copy $devs device_media
> else
> local dev
68c71
< local hline=""
---
> local hline=
70d72
< local dev retval
73,75c75,76
< 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD )
< retval=$?
< [ "$dev" ] || return $FAILURE
---
> 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD ) ||
> return $FAILURE
77,84c78
< f_device_find "$dev" $DEVICE_TYPE_FLOPPY devs
< [ "$devs" ] || return $FAILURE
< dev="${devs%%[$IFS]*}"
<
< f_struct_copy device_$dev device_media
< [ $retval -eq $SUCCESS ] || return $FAILURE
< else
< f_struct_copy device_$devs device_media
---
> f_struct_copy "$dev" device_media
104c98
< device_$dev get devname devname || return $FAILURE
---
> $dev get devname devname || return $FAILURE
114c108
< device_$dev get private mp
---
> $dev get private mp
123c117
< device_$dev get desc desc
---
> $dev get desc desc
141c135
< device_$dev get name name
---
> $dev get name name
161a156
> local name
162a158
> $dev get name name
164c160
< "$dev" "$file" "$probe_type"
---
> "$name" "$file" "$probe_type"
172c168
< device_$dev get private mp
---
> $dev get private mp
216c212
< device_$dev get private mp
---
> $dev get private mp
223c219
< device_$dev get desc desc
---
> $dev get desc desc