Deleted Added
full compact
cdrom.subr (252987) cdrom.subr (253333)
1if [ ! "$_MEDIA_CDROM_SUBR" ]; then _MEDIA_CDROM_SUBR=1
2#
3# Copyright (c) 2012-2013 Devin Teske
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:

--- 10 unchanged lines hidden (view full) ---

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
1if [ ! "$_MEDIA_CDROM_SUBR" ]; then _MEDIA_CDROM_SUBR=1
2#
3# Copyright (c) 2012-2013 Devin Teske
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:

--- 10 unchanged lines hidden (view full) ---

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
27# $FreeBSD: head/usr.sbin/bsdconfig/share/media/cdrom.subr 252987 2013-07-07 18:51:44Z dteske $
27# $FreeBSD: head/usr.sbin/bsdconfig/share/media/cdrom.subr 253333 2013-07-14 03:08:52Z dteske $
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." media/cdrom.subr
34f_include $BSDCFG_SHARE/device.subr
35f_include $BSDCFG_SHARE/dialog.subr

--- 103 unchanged lines hidden (view full) ---

139
140 : xxx # /cdrom.inf has been deprecated since 9.0-R
141
142 # No other CDROM media validation at this time
143
144 return $SUCCESS
145}
146
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." media/cdrom.subr
34f_include $BSDCFG_SHARE/device.subr
35f_include $BSDCFG_SHARE/dialog.subr

--- 103 unchanged lines hidden (view full) ---

139
140 : xxx # /cdrom.inf has been deprecated since 9.0-R
141
142 # No other CDROM media validation at this time
143
144 return $SUCCESS
145}
146
147# f_media_get_cdrom $device $file [$probe_only]
147# f_media_get_cdrom $device $file [$probe_type]
148#
149# Returns data from $file on a mounted CDROM device. Similar to cat(1). If
148#
149# Returns data from $file on a mounted CDROM device. Similar to cat(1). If
150# $probe_only is present and non-NULL, returns success if $file exists.
150# $probe_type is present and non-NULL, returns success if $file exists. If
151# $probe_type is equal to $PROBE_SIZE, prints the size of $file in bytes to
152# standard-out.
151#
152f_media_get_cdrom()
153{
153#
154f_media_get_cdrom()
155{
154 local dev="$1" file="$2" probe_only="$3"
156 local dev="$1" file="$2" probe_type="$3"
155
157
156 f_dprintf "f_media_get_cdrom: dev=[%s] file=[%s] probe_only=%s" \
157 "$dev" "$file" "$probe_only"
158 f_dprintf "f_media_get_cdrom: dev=[%s] file=[%s] probe_type=%s" \
159 "$dev" "$file" "$probe_type"
158
160
159 f_media_generic_get "$MOUNTPOINT" "$file" "$probe_only"
161 f_media_generic_get "$MOUNTPOINT" "$file" "$probe_type"
160}
161
162# f_media_shutdown_cdrom $device
163#
164# Shuts down the CDROM device and ejects the media using f_media_eject_cdrom(),
165# below. Return status should be ignored.
166#
167f_media_shutdown_cdrom()

--- 43 unchanged lines hidden ---
162}
163
164# f_media_shutdown_cdrom $device
165#
166# Shuts down the CDROM device and ejects the media using f_media_eject_cdrom(),
167# below. Return status should be ignored.
168#
169f_media_shutdown_cdrom()

--- 43 unchanged lines hidden ---