27c27
< # $FreeBSD: head/usr.sbin/bsdconfig/share/media/cdrom.subr 259054 2013-12-07 00:31:01Z dteske $
---
> # $FreeBSD: head/usr.sbin/bsdconfig/share/media/cdrom.subr 264840 2014-04-23 22:04:04Z dteske $
66c66,69
< elif [ $ndevs -gt 1 ]; then
---
> elif [ $ndevs -eq 1 ]; then
> f_struct_copy $devs device_media
> else
> local dev
69c72
< local hline=""
---
> local hline=
71d73
< local dev retval
74,76c76,77
< 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD )
< retval=$?
< [ "$dev" ] || return $FAILURE
---
> 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD ) ||
> return $FAILURE
78,85c79
< f_device_find "$dev" $DEVICE_TYPE_CDROM 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
101c95
< device_$dev get devname devname || return $FAILURE
---
> f_struct "$dev" get devname devname || return $FAILURE
156a151
> local name
157a153
> $dev get name name
159c155
< "$dev" "$file" "$probe_type"
---
> "$name" "$file" "$probe_type"
181c177
< 'umount -f "%s"' "$MOUNPOINT"
---
> 'umount -f "%s"' "$MOUNTPOINT"
198,200c194,202
< local dev="$1" devname err
< device_$dev get name devname || return $SUCCESS
< case "$devname" in /dev/iso9660/*) return $SUCCESS; esac
---
> local dev="$1" name devname err
>
> f_struct "$dev" || return $SUCCESS
> $dev get name name || return $SUCCESS
> $dev get devname devname || return $SUCCESS
>
> # Don't eject labels
> case "$name" in */*) return $SUCCESS; esac
>